Browse Source

update ,html rename portal

yee 7 years ago
parent
commit
74a75c47c8

+ 2 - 2
js/component/account/achievement/techAchievementDesc.jsx

@@ -1295,9 +1295,9 @@ const AchievementDetail = React.createClass({
     },
     tableRowClick(record, index) {
         if (record.ownerType == "0") {
-            window.open(globalConfig.context + '/admin/demand.html?rid=' + record.id + '#techDemandOrg');
+            window.open(globalConfig.context + '/user/account/demand.html?rid=' + record.id + '#techDemandOrg');
         } else if (record.ownerType == "1") {
-            window.open(globalConfig.context + '/admin/demand.html?rid=' + record.id + '#techDemandUser')
+            window.open(globalConfig.context + '/user/account/demand.html?rid=' + record.id + '#techDemandUser')
         };
     },
     showModal() {

+ 5 - 5
js/component/account/demand/techDemandDesc.jsx

@@ -395,7 +395,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                         label="需求文件(文本)" >
                         <div>{theData.textFileUrl ?
                             <span className="download-file">
-                                <a onClick={() => { window.open(globalConfig.context + '/api/admin/demand/download?id=' + this.props.data.id) }}>需求文件(文本文件)</a>
+                                <a onClick={() => { window.open(globalConfig.context + '/api/user/demand/download?id=' + this.props.data.id) }}>需求文件(文本文件)</a>
                             </span>
                             : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</div>
                     </FormItem>
@@ -774,7 +774,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         label="需求文件(文本)" >
                         <Upload
                             name="ratepay"
-                            action={globalConfig.context + "/api/admin/demand/uploadTextFile"}
+                            action={globalConfig.context + "/api/user/demand/uploadTextFile"}
                             data={{ 'sign': 'demand_text_file', 'uid': theData.employerId }}
                             beforeUpload={beforeUploadFile}
                             fileList={this.state.textFileList}
@@ -799,7 +799,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         </Upload>
                         <p style={{ marginTop: '10px' }}>{theData.textFileUrl ?
                             <span className="download-file">
-                                <a onClick={() => { window.open(globalConfig.context + '/api/admin/demand/download?id=' + this.props.data.id) }}>需求文件(文本文件)</a>
+                                <a onClick={() => { window.open(globalConfig.context + '/api/user/demand/download?id=' + this.props.data.id) }}>需求文件(文本文件)</a>
                             </span>
                             : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                     </FormItem>
@@ -1044,9 +1044,9 @@ const DemandDetail = React.createClass({
     },
     tableRowClick(record, index) {
         if (record.ownerType == "0") {
-            window.open(globalConfig.context + '/admin/achievement.html?rid=' + record.id + '#orgTechAchievement');
+            window.open(globalConfig.context + '/user/account/achievement.html?rid=' + record.id + '#orgTechAchievement');
         } else if (record.ownerType == "1") {
-            window.open(globalConfig.context + '/admin/achievement.html?rid=' + record.id + '#userTechAchievement')
+            window.open(globalConfig.context + '/user/account/achievement.html?rid=' + record.id + '#userTechAchievement')
         };
     },
     showModal() {

+ 59 - 120
js/component/account/index/collection.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Spin, Button, Tabs } from 'antd';
+import { Spin, Button, Tabs, Table } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 import DemandDesc from '../../portal/search/demandDesc';
@@ -22,7 +22,7 @@ const Content = React.createClass({
             url: globalConfig.context + "/api/user/portal/achievementInterestList",
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize
+                pageSize: this.state.achievementPagination.pageSize
             },
             success: function (data) {
                 let theArr = [];
@@ -35,11 +35,12 @@ const Content = React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
-                            id: thisdata.id,
-                            achievementId: thisdata.achievementId,
+                            interestId: thisdata.id,
+                            id: thisdata.achievementId,
                             createTime: thisdata.createTime,
                             name: thisdata.name,
                             serialNumber: thisdata.serialNumber,
+                            keyword: thisdata.keyword,
                             deletedSign: thisdata.deletedSign,
                             auditStatus: thisdata.auditStatus,
                             createTimeFormattedDate: thisdata.createTimeFormattedDate
@@ -68,21 +69,10 @@ const Content = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/demand/list",
+            url: globalConfig.context + "/api/user/portal/demandInterestList",
             data: {
                 pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                serialNumber: this.state.serialNumber,
-                name: this.state.name,
-                keyword: this.state.keyword,
-                demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
-                status: this.state.status ? Number(this.state.status) : undefined,
-                releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
-                validityPeriodStartDate: this.state.validityPeriodDate[0],
-                validityPeriodEndDate: this.state.validityPeriodDate[1],
-                releaseDateStartDate: this.state.releaseDate[0],
-                releaseDateEndDate: this.state.releaseDate[1],
-                auditStatus: this.state.auditStatus
+                pageSize: this.state.demandPagination.pageSize
             },
             success: function (data) {
                 let theArr = [];
@@ -95,28 +85,24 @@ const Content = React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
-                            id: thisdata.id,
-                            serialNumber: thisdata.serialNumber,
-                            dataCategory: thisdata.dataCategory,
-                            name: thisdata.name,
+                            interestId: thisdata.id,
+                            id: thisdata.demandtId,
+                            createTime: thisdata.createTime,
                             keyword: thisdata.keyword,
-                            releaseDate: thisdata.releaseDate,
-                            demandType: thisdata.demandType,
-                            validityPeriod: thisdata.validityPeriod,
+                            name: thisdata.name,
                             status: thisdata.status,
-                            releaseStatus: thisdata.releaseStatus,
-                            employerId: thisdata.employerId,
-                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
-                            validityPeriodFormattedDate: thisdata.validityPeriodFormattedDate,
-                            auditStatus: thisdata.auditStatus
+                            serialNumber: thisdata.serialNumber,
+                            deletedSign: thisdata.deletedSign,
+                            auditStatus: thisdata.auditStatus,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate
                         });
                     };
                 }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
+                this.state.demandPagination.current = data.data.pageNo;
+                this.state.demandPagination.total = data.data.totalCount;
                 this.setState({
-                    dataSource: theArr,
-                    pagination: this.state.pagination
+                    demandDataSource: theArr,
+                    demandPagination: this.state.demandPagination
                 });
             }.bind(this),
         }).always(function () {
@@ -156,50 +142,22 @@ const Content = React.createClass({
                     dataIndex: 'keyword',
                     key: 'keyword',
                 }, {
-                    title: '需求类型',
-                    dataIndex: 'demandType',
-                    key: 'demandType',
-                    render: text => { return getDemandType(text); }
-                }, {
-                    title: '审核状态',
+                    title: '状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>未提交审核(草稿)</span>;
-                            case "1":
-                                return <span>提交审核</span>;
-                            case "2":
-                                return <span>审核中</span>;
-                            case "3":
-                                return <span>审核通过</span>;
-                            case "4":
-                                return <span>审核未通过</span>;
+                    render: (text, record) => {
+                        if (record.deletedSign == 1) {
+                            return "已删除"
+                        } else if (record.auditStatus !== 3) {
+                            return "已下架"
+                        } else {
+                            return "正常"
                         }
                     }
                 }, {
-                    title: '需求状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>进行中</span>;
-                            case "1":
-                                return <span>未解决</span>;
-                            case "2":
-                                return <span>已解决</span>;
-                        }
-                    }
-                }, {
-                    title: '有效期限',
-                    dataIndex: 'validityPeriodFormattedDate',
-                    key: 'validityPeriodFormattedDate',
-                }, {
-                    title: '发布时间',
-                    dataIndex: 'releaseDateFormattedDate',
-                    key: 'releaseDateFormattedDate',
+                    title: '关注时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
                 }
             ],
             achievementDataSource: [],
@@ -229,82 +187,63 @@ const Content = React.createClass({
                     dataIndex: 'keyword',
                     key: 'keyword',
                 }, {
-                    title: '需求类型',
-                    dataIndex: 'demandType',
-                    key: 'demandType',
-                    render: text => { return getDemandType(text); }
-                }, {
-                    title: '审核状态',
+                    title: '状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>未提交审核(草稿)</span>;
-                            case "1":
-                                return <span>提交审核</span>;
-                            case "2":
-                                return <span>审核中</span>;
-                            case "3":
-                                return <span>审核通过</span>;
-                            case "4":
-                                return <span>审核未通过</span>;
+                    render: (text, record) => {
+                        if (record.deletedSign == 1) {
+                            return "已删除"
+                        } else if (record.auditStatus !== 3) {
+                            return "已下架"
+                        } else if (record.status == 0) {
+                            return "未解决"
+                        } else if (record.status == 1) {
+                            return "已解决"
                         }
                     }
                 }, {
-                    title: '需求状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>进行中</span>;
-                            case "1":
-                                return <span>未解决</span>;
-                            case "2":
-                                return <span>已解决</span>;
-                        }
-                    }
-                }, {
-                    title: '有效期限',
-                    dataIndex: 'validityPeriodFormattedDate',
-                    key: 'validityPeriodFormattedDate',
-                }, {
-                    title: '发布时间',
-                    dataIndex: 'releaseDateFormattedDate',
-                    key: 'releaseDateFormattedDate',
+                    title: '关注时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
                 }
             ],
             demandDataSource: [],
         };
     },
-    componentDidMount() {
+    componentWillMount() {
         this.achievementLoadData();
+        this.demandLoadData();
     },
     tabChange(key) {
 
     },
     demandRowClick(record, index) {
         this.state.demandRowData = record;
-        this.setState({
-            demandShowDesc: true
-        });
+        if (record.deletedSign !== 1 && record.auditStatus == 3) {
+            this.setState({
+                demandShowDesc: true
+            });
+        };
     },
     achievementRowClick(record, index) {
         this.state.achievementRowData = record;
-        this.setState({
-            achievementShowDesc: true
-        });
+        if (record.deletedSign !== 1 && record.auditStatus == 3) {
+            this.setState({
+                achievementShowDesc: true
+            });
+        };
     },
     demandCloseDesc(e) {
         this.setState({
             demandShowDesc: e
         });
+        this.demandLoadData();
     },
     achievementCloseDesc(e) {
         this.setState({
             achievementShowDesc: e
         });
+        this.achievementLoadData();
     },
     render() {
         return (
@@ -327,10 +266,10 @@ const Content = React.createClass({
                 </Spin>
                 <DemandDesc data={this.state.demandRowData}
                     showDesc={this.state.demandShowDesc}
-                    closeDesc={this.demandShowDesc} />
+                    closeDesc={this.demandCloseDesc} />
                 <AchievementDesc data={this.state.achievementRowData}
                     showDesc={this.state.achievementShowDesc}
-                    closeDesc={this.achievementShowDesc} />
+                    closeDesc={this.achievementCloseDesc} />
             </div>
         )
     }

+ 1 - 1
js/component/account/topTab.jsx

@@ -27,7 +27,7 @@ const TopTab = React.createClass({
             <div className="account-top" >
                 <div className="acc-top-user">
                     <span className="acc-top-user-name">欢迎您, {userData.nickname || userData.number || this.state.username} <a onClick={this.logOut}>[ 退出 ]</a></span>
-                    <span className="acc-top-user-toindex"><a href={userData.type == 1 ? globalConfig.context + "/user/groupCertify.html" : globalConfig.context + "/user/certify.html"}>实名认证</a>&nbsp;&nbsp;&nbsp;<a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
+                    <span className="acc-top-user-toindex"><a href={userData.type == 1 ? globalConfig.context + "/user/groupCertify.html" : globalConfig.context + "/user/certify.html"}>实名认证</a>&nbsp;&nbsp;&nbsp;<a href={globalConfig.avatarHost + "/portal/index.html"}>返回首页</a></span>
                 </div>
                 <div className="acc-index">
                     <div className="acc-index-imgbox">

+ 1 - 1
js/component/certify/top.jsx

@@ -13,7 +13,7 @@ const LoginTop = React.createClass({
                     <div className="certify-text">
                         <span className="text">实名认证</span>
                         <span className="alink">
-                            <a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a>
+                            <a href={globalConfig.avatarHost + "/portal/index.html"}>返回首页</a>
                             <a href="./account/index">尊敬的{userData.nickname || userData.number || this.state.username}</a>
                             <a href="./login.html">退出</a>
                             <a href="./index.html">交易管理中心</a>

+ 1 - 1
js/component/groupCertify/top.jsx

@@ -13,7 +13,7 @@ const LoginTop = React.createClass({
                     <div className="certify-text">
                         <span className="text">实名认证</span>
                         <span className="alink">
-                            <a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a>
+                            <a href={globalConfig.avatarHost + "/portal/index.html"}>返回首页</a>
                             <a href="./account/index.html">尊敬的{userData.nickname || userData.number || this.state.username}</a>
                             <a href="./login.html">退出</a>
                             <a href="./index.html">交易管理中心</a>

+ 1 - 1
js/component/login/loginTop.jsx

@@ -12,7 +12,7 @@ const LoginTop = React.createClass({
                     </div>
                     <div className="logo-text">
                         <span>科技交易认知计算平台</span>
-                        <span className="back"><a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
+                        <span className="back"><a href={globalConfig.avatarHost + "/portal/index.html"}>返回首页</a></span>
                     </div>
                 </div>
             </div>

+ 1 - 1
js/component/manageCenter/topTab.jsx

@@ -448,7 +448,7 @@ const TopTab = React.createClass({
                         };
                         this.setState({ userModalShow: true });
                     }}> {adminData.name || adminData.mobile} </a> : <a onClick={this.logOut}>{this.state.username}</a>} <a onClick={this.logOut}>[ 退出 ]</a></span>
-                    <span className="acc-top-user-toindex"><a href={globalConfig.avatarHost + "/html/index.html"}>返回首页</a></span>
+                    <span className="acc-top-user-toindex"><a href={globalConfig.avatarHost + "/portal/index.html"}>返回首页</a></span>
                     <a onClick={() => { this.setState({ messageModalShow: true }); }} className="user-badge">
                         <Icon type="mail" />
                         {(() => {

+ 3 - 3
js/component/portal/search/achievementDesc.jsx

@@ -222,7 +222,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.maturityTextFileUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_maturity_text_file') }}>成熟度证明材料(文本文件)</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_maturity_text_file') }}>成熟度证明材料(文本文件)</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>
@@ -301,7 +301,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.techPlanUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_tech_plan') }}>技术方案</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_tech_plan') }}>技术方案</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>
@@ -311,7 +311,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.businessPlanUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_business_plan') }}>商业计划书</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_business_plan') }}>商业计划书</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>

+ 2 - 2
js/component/portal/search/demandDesc.jsx

@@ -196,7 +196,7 @@ const DemandDetail = React.createClass({
                             <Col span={20}>
                                 {theData.textFileUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_maturity_text_file') }}>需求文件(文本文件)</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/demand/download?id=' + this.props.data.id + '&sign=demand_maturity_text_file') }}>需求文件(文本文件)</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>
@@ -222,7 +222,7 @@ const DemandDetail = React.createClass({
                             <Col span={20}>{theData.fixedScheme}</Col>
                         </Row>
                         <div className="interest clearfix">
-                            {theData.achievementInterestId ? <a onClick={this.cancelInterestClick}><Icon type="heart" /> 不感兴趣</a>
+                            {theData.demandInterestId ? <a onClick={this.cancelInterestClick}><Icon type="heart" /> 不感兴趣</a>
                                 : <a onClick={this.interestClick}><Icon type="heart-o" /> 感兴趣</a>}
                         </div>
                     </Modal>

html/css/highTech.css → portal/css/highTech.css


html/css/iconfont/iconfont.eot → portal/css/iconfont/iconfont.eot


html/css/iconfont/iconfont.svg → portal/css/iconfont/iconfont.svg


html/css/iconfont/iconfont.ttf → portal/css/iconfont/iconfont.ttf


html/css/iconfont/iconfont.woff → portal/css/iconfont/iconfont.woff


html/css/index.css → portal/css/index.css


html/css/style.css → portal/css/style.css


html/highTech.html → portal/highTech.html


html/img/discount_ioc_1.png → portal/img/discount_ioc_1.png


html/img/discount_ioc_2.png → portal/img/discount_ioc_2.png


html/img/discount_ioc_3.png → portal/img/discount_ioc_3.png


html/img/discount_ioc_4.png → portal/img/discount_ioc_4.png


html/img/discount_ioc_5.png → portal/img/discount_ioc_5.png


html/img/flowChart.png → portal/img/flowChart.png


html/img/img1.jpg → portal/img/img1.jpg


html/img/li_ioc.png → portal/img/li_ioc.png


html/img/logo.png → portal/img/logo.png


html/img/logo_sm.png → portal/img/logo_sm.png


html/img/mx_img_1.png → portal/img/mx_img_1.png


html/img/mx_img_2.png → portal/img/mx_img_2.png


html/img/mx_img_3.png → portal/img/mx_img_3.png


html/img/mx_img_4.png → portal/img/mx_img_4.png


html/img/search_ioc.png → portal/img/search_ioc.png


html/img/slide_img_1.png → portal/img/slide_img_1.png


html/img/slide_img_s_1.png → portal/img/slide_img_s_1.png


html/img/zc_img_1.png → portal/img/zc_img_1.png


html/index.html → portal/index.html


html/js/public.js → portal/js/public.js