yee 7 years ago
parent
commit
0165682dbc

+ 49 - 0
js/component/account/services/activity.jsx

@@ -9,6 +9,55 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 
 
 
 
+if (!Array.prototype.includes) {
+    Object.defineProperty(Array.prototype, 'includes', {
+        value: function (searchElement, fromIndex) {
+
+            // 1. Let O be ? ToObject(this value).
+            if (this == null) {
+                throw new TypeError('"this" is null or not defined');
+            }
+
+            var o = Object(this);
+
+            // 2. Let len be ? ToLength(? Get(O, "length")).
+            var len = o.length >>> 0;
+
+            // 3. If len is 0, return false.
+            if (len === 0) {
+                return false;
+            }
+
+            // 4. Let n be ? ToInteger(fromIndex).
+            //    (If fromIndex is undefined, this step produces the value 0.)
+            var n = fromIndex | 0;
+
+            // 5. If n ≥ 0, then
+            //  a. Let k be n.
+            // 6. Else n < 0,
+            //  a. Let k be len + n.
+            //  b. If k < 0, let k be 0.
+            var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+
+            // 7. Repeat, while k < len
+            while (k < len) {
+                // a. Let elementK be the result of ? Get(O, ! ToString(k)).
+                // b. If SameValueZero(searchElement, elementK) is true, return true.
+                // c. Increase k by 1.
+                // NOTE: === provides the correct "SameValueZero" comparison needed here.
+                if (o[k] === searchElement) {
+                    return true;
+                }
+                k++;
+            }
+
+            // 8. Return false
+            return false;
+        }
+    });
+}
+
+
 const ActivityForm = Form.create()(React.createClass({
 const ActivityForm = Form.create()(React.createClass({
     getInitialState() {
     getInitialState() {
         return {
         return {

+ 2 - 2
js/component/account/services/contract/contractDetail.jsx

@@ -5,7 +5,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import moment from 'moment';
 import { copyrightStateList } from '../../../dataDic.js';
 import { copyrightStateList } from '../../../dataDic.js';
-import { companySearch, getCopyrightState, getPatentType, getPatentState, getCognizanceState, getTechnologyState } from '../../../tools.js';
+import { companySearch, getContractState, getCopyrightState, getPatentType, getPatentState, getCognizanceState, getTechnologyState } from '../../../tools.js';
 
 
 const ContractDetailForm = Form.create()(React.createClass({
 const ContractDetailForm = Form.create()(React.createClass({
     getInitialState() {
     getInitialState() {
@@ -20,7 +20,7 @@ const ContractDetailForm = Form.create()(React.createClass({
                     title: '申请状态',
                     title: '申请状态',
                     dataIndex: 'status',
                     dataIndex: 'status',
                     key: 'status',
                     key: 'status',
-                    render: (text) => { return getCopyrightState(text) }
+                    render: (text) => { return getContractState(text) }
                 }, {
                 }, {
                     title: '处理时间',
                     title: '处理时间',
                     dataIndex: 'recordTimeFormattedDate',
                     dataIndex: 'recordTimeFormattedDate',

+ 5 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -393,7 +393,11 @@ const DemandDetailShow = Form.create()(React.createClass({
                                 {...formItemLayout}
                                 {...formItemLayout}
                                 label="联系人" >
                                 label="联系人" >
                                 <span>{this.state.contactsObj[theData.contacts]}</span>
                                 <span>{this.state.contactsObj[theData.contacts]}</span>
-                            </FormItem> : <div></div>}
+                            </FormItem> : <FormItem className="half-item"
+                                {...formItemLayout}
+                                label="联系人" >
+                                <span>{theData.contactsName}</span>
+                            </FormItem>}
                         </div>}
                         </div>}
                     <div className="clearfix">
                     <div className="clearfix">
                         <FormItem className="half-item"
                         <FormItem className="half-item"

+ 39 - 12
js/component/manageCenter/idea/activity/activityUserList.jsx

@@ -131,16 +131,16 @@ const ActivityTable = React.createClass({
         }
         }
     },
     },
     delectRow() {
     delectRow() {
-        let deletedIds = [];
-        for (let idx = 0; idx < this.state.selectedRows.length; idx++) {
-            let rowItem = this.state.selectedRows[idx];
-            if (rowItem.id) {
-                deletedIds.push(rowItem.id)
-            };
-        };
+        let theAid = null, theUid = null;
+        if (this.state.selectedRows && this.state.selectedRows.length) {
+            theAid = this.state.selectedRows[0].aid;
+            theUid = this.state.selectedRows[0].uid;
+        } else {
+            return;
+        }
         this.setState({
         this.setState({
             selectedRowKeys: [],
             selectedRowKeys: [],
-            loading: deletedIds.length > 0
+            loading: true
         });
         });
         $.ajax({
         $.ajax({
             method: "POST",
             method: "POST",
@@ -148,7 +148,8 @@ const ActivityTable = React.createClass({
             crossDomain: false,
             crossDomain: false,
             url: globalConfig.context + '/api/admin/activityUser/delete',
             url: globalConfig.context + '/api/admin/activityUser/delete',
             data: {
             data: {
-                ids: deletedIds
+                aid: theAid,
+                uid: theUid
             }
             }
         }).done(function (data) {
         }).done(function (data) {
             if (data.error && data.error.length) {
             if (data.error && data.error.length) {
@@ -162,6 +163,31 @@ const ActivityTable = React.createClass({
             this.loadData();
             this.loadData();
         }.bind(this));
         }.bind(this));
     },
     },
+    cleanCache() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "post",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/activity/cleanCache',
+            data: {
+                'cacheKey': 'activity_portal_list_cache_key'
+            },
+            success: function (data) {
+                if (data.error && data.error.length) {
+                    message.warning(data.error[0].message);
+                } else {
+                    message.success('清除缓存成功!');
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     reset() {
     reset() {
         this.state.searchName = undefined;
         this.state.searchName = undefined;
         this.state.searchMobile = undefined;
         this.state.searchMobile = undefined;
@@ -175,8 +201,8 @@ const ActivityTable = React.createClass({
             selectedRowKeys: this.state.selectedRowKeys,
             selectedRowKeys: this.state.selectedRowKeys,
             onChange: (selectedRowKeys, selectedRows) => {
             onChange: (selectedRowKeys, selectedRows) => {
                 this.setState({
                 this.setState({
-                    selectedRows: selectedRows,
-                    selectedRowKeys: selectedRowKeys
+                    selectedRows: selectedRows.slice(-1),
+                    selectedRowKeys: selectedRowKeys.slice(-1),
                 });
                 });
             }
             }
         };
         };
@@ -210,9 +236,10 @@ const ActivityTable = React.createClass({
                     <Button type='danger' disabled={!hasSelected} onClick={this.delectRow}>
                     <Button type='danger' disabled={!hasSelected} onClick={this.delectRow}>
                         删除<Icon type="minus" />
                         删除<Icon type="minus" />
                     </Button>
                     </Button>
+                    <Button type="primary" onClick={() => { this.cleanCache() }}>清除缓存</Button>
                 </div>
                 </div>
                 <Spin spinning={this.state.loading}>
                 <Spin spinning={this.state.loading}>
-                    <Table
+                    <Table className="no-all-select"
                         columns={this.state.columns}
                         columns={this.state.columns}
                         dataSource={this.state.tableData}
                         dataSource={this.state.tableData}
                         pagination={this.state.pagination}
                         pagination={this.state.pagination}

+ 3 - 41
js/component/manageCenter/idea/bigShot/lecture.jsx

@@ -77,6 +77,7 @@ const Lecture = React.createClass({
                             id: thisdata.id,
                             id: thisdata.id,
                             uid: thisdata.uid,
                             uid: thisdata.uid,
                             lectureTime: thisdata.lectureTime,
                             lectureTime: thisdata.lectureTime,
+                            lecturer: thisdata.lecturer,
                             endTime: thisdata.endTime,
                             endTime: thisdata.endTime,
                             name: thisdata.name,
                             name: thisdata.name,
                             summary: thisdata.summary,
                             summary: thisdata.summary,
@@ -125,6 +126,7 @@ const Lecture = React.createClass({
                             id: thisdata.id,
                             id: thisdata.id,
                             uid: thisdata.uid,
                             uid: thisdata.uid,
                             lectureTime: thisdata.lectureTime,
                             lectureTime: thisdata.lectureTime,
+                            lecturer: thisdata.lecturer,
                             endTime: thisdata.endTime,
                             endTime: thisdata.endTime,
                             name: thisdata.name,
                             name: thisdata.name,
                             summary: thisdata.summary,
                             summary: thisdata.summary,
@@ -170,6 +172,7 @@ const Lecture = React.createClass({
                             id: thisdata.id,
                             id: thisdata.id,
                             uid: thisdata.uid,
                             uid: thisdata.uid,
                             lectureTime: thisdata.lectureTime,
                             lectureTime: thisdata.lectureTime,
+                            lecturer: thisdata.lecturer,
                             endTime: thisdata.endTime,
                             endTime: thisdata.endTime,
                             name: thisdata.name,
                             name: thisdata.name,
                             summary: thisdata.summary,
                             summary: thisdata.summary,
@@ -193,7 +196,6 @@ const Lecture = React.createClass({
         }.bind(this));
         }.bind(this));
     },
     },
     loadData() {
     loadData() {
-        //    this.loadUserData();
         this.loadLectureData();
         this.loadLectureData();
         this.loadHotData();
         this.loadHotData();
         this.loadDynamicData();
         this.loadDynamicData();
@@ -205,18 +207,6 @@ const Lecture = React.createClass({
             addModal: {},
             addModal: {},
             selectedRowKeys: [],
             selectedRowKeys: [],
             selectedRows: [],
             selectedRows: [],
-            // userPagination: {
-            //     defaultCurrent: 1,
-            //     defaultPageSize: 10,
-            //     showQuickJumper: true,
-            //     pageSize: 10,
-            //     onChange: function (page) {
-            //         this.loadUserData(page);
-            //     }.bind(this),
-            //     showTotal: function (total) {
-            //         return '共' + total + '条数据';
-            //     }
-            // },
             lecturePagination: {
             lecturePagination: {
                 defaultCurrent: 1,
                 defaultCurrent: 1,
                 defaultPageSize: 10,
                 defaultPageSize: 10,
@@ -229,34 +219,6 @@ const Lecture = React.createClass({
                     return '共' + total + '条数据';
                     return '共' + total + '条数据';
                 }
                 }
             },
             },
-            // userColumns: [
-            //     {
-            //         title: '编号',
-            //         dataIndex: 'number',
-            //         key: 'number',
-            //     }, {
-            //         title: '姓名',
-            //         dataIndex: 'username',
-            //         key: 'username',
-            //     }, {
-            //         title: '从事领域',
-            //         dataIndex: 'engagedField',
-            //         key: 'engagedField',
-            //         render: text => { return getTechField(text[0], text[1], text[2]) }
-            //     }, {
-            //         title: '职称名字',
-            //         dataIndex: 'professionalTitle',
-            //         key: 'professionalTitle',
-            //     }, {
-            //         title: '工作单位',
-            //         dataIndex: 'workUnit',
-            //         key: 'workUnit',
-            //     }, {
-            //         title: '成果数量',
-            //         dataIndex: 'achievementNums',
-            //         key: 'achievementNums',
-            //     }
-            // ],
             lectureColumns: [
             lectureColumns: [
                 {
                 {
                     title: '讲堂名称',
                     title: '讲堂名称',

+ 1 - 1
js/component/manageCenter/idea/news/news.jsx

@@ -228,7 +228,7 @@ const News = React.createClass({
                 titleImg: this.state.RowData.titleImg,
                 titleImg: this.state.RowData.titleImg,
                 author: this.state.RowData.author,
                 author: this.state.RowData.author,
                 type: this.props.newsType,
                 type: this.props.newsType,
-                hot: this.state.RowData.hot,
+                hot: this.state.RowData.hot || 0,
                 source: this.state.RowData.source,
                 source: this.state.RowData.source,
                 sourceUrl: this.state.RowData.sourceUrl,
                 sourceUrl: this.state.RowData.sourceUrl,
                 summary: this.state.RowData.summary,
                 summary: this.state.RowData.summary,

+ 51 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -7,6 +7,54 @@ import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 
 
+if (!Array.prototype.includes) {
+    Object.defineProperty(Array.prototype, 'includes', {
+        value: function (searchElement, fromIndex) {
+
+            // 1. Let O be ? ToObject(this value).
+            if (this == null) {
+                throw new TypeError('"this" is null or not defined');
+            }
+
+            var o = Object(this);
+
+            // 2. Let len be ? ToLength(? Get(O, "length")).
+            var len = o.length >>> 0;
+
+            // 3. If len is 0, return false.
+            if (len === 0) {
+                return false;
+            }
+
+            // 4. Let n be ? ToInteger(fromIndex).
+            //    (If fromIndex is undefined, this step produces the value 0.)
+            var n = fromIndex | 0;
+
+            // 5. If n ≥ 0, then
+            //  a. Let k be n.
+            // 6. Else n < 0,
+            //  a. Let k be len + n.
+            //  b. If k < 0, let k be 0.
+            var k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
+
+            // 7. Repeat, while k < len
+            while (k < len) {
+                // a. Let elementK be the result of ? Get(O, ! ToString(k)).
+                // b. If SameValueZero(searchElement, elementK) is true, return true.
+                // c. Increase k by 1.
+                // NOTE: === provides the correct "SameValueZero" comparison needed here.
+                if (o[k] === searchElement) {
+                    return true;
+                }
+                k++;
+            }
+
+            // 8. Return false
+            return false;
+        }
+    });
+}
+
 const ActivityForm = Form.create()(React.createClass({
 const ActivityForm = Form.create()(React.createClass({
     getInitialState() {
     getInitialState() {
         return {
         return {
@@ -106,6 +154,7 @@ const ActivityForm = Form.create()(React.createClass({
         };
         };
     },
     },
     intellectualChange(nextTargetKeys, direction, moveKeys) {
     intellectualChange(nextTargetKeys, direction, moveKeys) {
+        debugger
         this.setState({ targetKeys: nextTargetKeys });
         this.setState({ targetKeys: nextTargetKeys });
     },
     },
     intellectualSelectChange(sourceSelectedKeys, targetSelectedKeys) {
     intellectualSelectChange(sourceSelectedKeys, targetSelectedKeys) {
@@ -222,8 +271,8 @@ const ActivityForm = Form.create()(React.createClass({
                                     height: 300,
                                     height: 300,
                                 }}
                                 }}
                                 titles={['未选择', '已选择']}
                                 titles={['未选择', '已选择']}
-                                targetKeys={this.state.targetKeys}
-                                selectedKeys={this.state.selectedKeys}
+                                targetKeys={this.state.targetKeys || []}
+                                selectedKeys={this.state.selectedKeys || []}
                                 onChange={this.intellectualChange}
                                 onChange={this.intellectualChange}
                                 onSelectChange={this.intellectualSelectChange}
                                 onSelectChange={this.intellectualSelectChange}
                                 render={item => `${item.name}-${item.number}`}
                                 render={item => `${item.name}-${item.number}`}

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/companyDetail.jsx

@@ -949,7 +949,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('firmTotal', {
                             {getFieldDecorator('firmTotal', {
                                 initialValue: theData.firmTotal || 0
                                 initialValue: theData.firmTotal || 0
                             })(
                             })(
-                                <InputNumber min={0} max={999999} step={0.01} />
+                                <InputNumber min={0} max={999999} step={1} />
                                 )}
                                 )}
                         </FormItem>
                         </FormItem>
                         <FormItem className="half-item"
                         <FormItem className="half-item"
@@ -959,7 +959,7 @@ const CompanyDetail = Form.create()(React.createClass({
                             {getFieldDecorator('techTotal', {
                             {getFieldDecorator('techTotal', {
                                 initialValue: theData.techTotal || 0
                                 initialValue: theData.techTotal || 0
                             })(
                             })(
-                                <InputNumber min={0} max={999999} step={0.01} />
+                                <InputNumber min={0} max={999999} step={1} />
                                 )}
                                 )}
                             <span>其中科技人员占比
                             <span>其中科技人员占比
                         {(() => {
                         {(() => {

+ 1 - 1
js/component/manageCenter/servicesManage/patent/correction.jsx

@@ -41,7 +41,7 @@ const Correction = React.createClass({
                         patentType: thisdata.patentCatagory,
                         patentType: thisdata.patentCatagory,
                         patentName: thisdata.patentName,
                         patentName: thisdata.patentName,
                         patentState: thisdata.patentState,
                         patentState: thisdata.patentState,
-                        endData: [thisdata.patentCatagory, thisdata.authorizedDate],
+                        endData: [thisdata.patentCatagory, thisdata.recordTime],
                         author: thisdata.author,
                         author: thisdata.author,
                         authorizedDate: thisdata.authorizedDate
                         authorizedDate: thisdata.authorizedDate
                     });
                     });

+ 12 - 4
js/component/manageCenter/set/role.jsx

@@ -179,10 +179,18 @@ const Role = React.createClass({
                 let _me = this;
                 let _me = this;
                 if (record.permissions) {
                 if (record.permissions) {
                     return <div>
                     return <div>
-                        {record.permissions.map((tag) => {
-                            return <Tag key={tag} closable={false}>
-                                {_me.state.permissions[tag]}
-                            </Tag>
+                        {record.permissions.map((tag, i) => {
+                            if (i < 3) {
+                                return <Tag key={tag} closable={false}>
+                                    {_me.state.permissions[tag]}
+                                </Tag>
+                            } else if (i == 3) {
+                                return <Tag key={tag} closable={false}>
+                                    ...
+                                </Tag>
+                            } else {
+                                return false;
+                            }
                         }
                         }
                         )}
                         )}
                     </div>
                     </div>

+ 4 - 3
js/component/manageCenter/userManage/orgDesc.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';
-import { Icon, Modal, message, Spin, Button, Tabs, Input, Select, Form, DatePicker, Cascader, Upload } from 'antd';
+import { Icon, Modal, message, Spin, Button, Tabs, Input, InputNumber, Select, Form, DatePicker, Cascader, Upload } from 'antd';
 import './userList.less';
 import './userList.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
@@ -305,7 +305,7 @@ const OrgShow = Form.create()(React.createClass({
                             {...formItemLayout}
                             {...formItemLayout}
                             label="注册资金" >
                             label="注册资金" >
                             {getFieldDecorator('registeredCapital')(
                             {getFieldDecorator('registeredCapital')(
-                                <span>{this.state.registeredCapital}</span>
+                                <span>{this.state.registeredCapital || 0} 万元</span>
                             )}
                             )}
                         </FormItem>
                         </FormItem>
                         <FormItem
                         <FormItem
@@ -782,8 +782,9 @@ const OrgCertify = Form.create()(React.createClass({
                             {getFieldDecorator('registeredCapital', {
                             {getFieldDecorator('registeredCapital', {
                                 initialValue: this.state.registeredCapital
                                 initialValue: this.state.registeredCapital
                             })(
                             })(
-                                <Input />
+                                <InputNumber min={0} max={999999} step={1} />
                                 )}
                                 )}
+                            <span> 万元</span>
                         </FormItem>
                         </FormItem>
                         <FormItem
                         <FormItem
                             {...formItemLayout}
                             {...formItemLayout}

+ 1 - 1
js/component/manageCenter/userManage/userDesc.jsx

@@ -56,7 +56,7 @@ const UserShow = Form.create()(React.createClass({
                     paymentDate: thisData.paymentDate,
                     paymentDate: thisData.paymentDate,
                     expert: thisData.expert,
                     expert: thisData.expert,
                     celebrity: thisData.celebrity,
                     celebrity: thisData.celebrity,
-                    level: thisData.level,
+                    level: thisData.lvl,
                     aid: thisData.aid,   //业务员ID
                     aid: thisData.aid,   //业务员ID
                     mid: thisData.mid  //客户经理ID
                     mid: thisData.mid  //客户经理ID
                 });
                 });

+ 20 - 6
js/component/portal/portal.less

@@ -517,9 +517,9 @@
     }
     }
 }
 }
 
 
-.detial_sub {
+.detail_sub {
     line-height: 32px;
     line-height: 32px;
-    .detial_sub_icon {
+    .detail_sub_icon {
         vertical-align: middle;
         vertical-align: middle;
         display: inline-block;
         display: inline-block;
         height: 20px;
         height: 20px;
@@ -533,12 +533,12 @@
             height: 20px;
             height: 20px;
         }
         }
     }
     }
-    .detial_sub_title {
+    .detail_sub_title {
         color: #666;
         color: #666;
         margin-left: 6px;
         margin-left: 6px;
         margin-right: 6px;
         margin-right: 6px;
     }
     }
-    .detial_sub_text {
+    .detail_sub_text {
         color: #333;
         color: #333;
         i {
         i {
             background: #ccc;
             background: #ccc;
@@ -547,10 +547,21 @@
             margin-right: 6px;
             margin-right: 6px;
         }
         }
     }
     }
+    .detail_sub_demandDes {
+        display: inline-block;
+        width: 480px;
+        line-height: 20px;
+        height: 22px;
+        vertical-align: middle;
+        color: #333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
     .money_text {
     .money_text {
         color: #58a3ff;
         color: #58a3ff;
     }
     }
-    .detial_sub_score {
+    .detail_sub_score {
         display: inline-block;
         display: inline-block;
         width: 90px;
         width: 90px;
         >span {
         >span {
@@ -582,9 +593,12 @@
             left: -12px;
             left: -12px;
             top: -1px;
             top: -1px;
         }
         }
-        >span {
+        >p {
             font-size: 20px;
             font-size: 20px;
             color: #58a3ff;
             color: #58a3ff;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
         }
         }
     }
     }
     .interest_list_name {
     .interest_list_name {

+ 1 - 1
js/component/portal/search/achievement.jsx

@@ -274,7 +274,7 @@ const Content = React.createClass({
                             {this.state.dataSource.map((item) => {
                             {this.state.dataSource.map((item) => {
                                 return <li key={item.id} onClick={() => { this.tableRowClick(item) }}>
                                 return <li key={item.id} onClick={() => { this.tableRowClick(item) }}>
                                     <div className="interest_list_title" style={{ paddingLeft: '20px' }}>
                                     <div className="interest_list_title" style={{ paddingLeft: '20px' }}>
-                                        <span>{item.name}</span>
+                                        <p title={item.name}>{item.name}</p>
                                     </div>
                                     </div>
                                     <div className="interest_list_name" style={{ paddingLeft: '20px' }}>
                                     <div className="interest_list_name" style={{ paddingLeft: '20px' }}>
                                         <p>{item.ownerName}</p>
                                         <p>{item.ownerName}</p>

+ 20 - 20
js/component/portal/search/demand.jsx

@@ -253,7 +253,7 @@ const Content = React.createClass({
                                 return <li key={item.id} onClick={() => { this.tableRowClick(item) }}>
                                 return <li key={item.id} onClick={() => { this.tableRowClick(item) }}>
                                     <div className="interest_list_title">
                                     <div className="interest_list_title">
                                         <img src={demand_sup} alt="" />
                                         <img src={demand_sup} alt="" />
-                                        <span>{item.name}</span>
+                                        <p title={item.name}>{item.name}</p>
                                     </div>
                                     </div>
                                     <div className="interest_list_name" style={{ paddingLeft: '20px' }}>
                                     <div className="interest_list_name" style={{ paddingLeft: '20px' }}>
                                         <p>{item.employerName}</p>
                                         <p>{item.employerName}</p>
@@ -262,40 +262,40 @@ const Content = React.createClass({
                                             <img src={item.level ? certify : uncertify} alt="" />
                                             <img src={item.level ? certify : uncertify} alt="" />
                                         </div>
                                         </div>
                                     </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_5} alt="需求" />
                                             <img src={demand_ico_5} alt="需求" />
                                         </span>
                                         </span>
-                                        <span className="detial_sub_title">关键词: </span>
-                                        <span className="detial_sub_text">{item.keyword}</span>
+                                        <span className="detail_sub_title">关键词: </span>
+                                        <span className="detail_sub_text">{item.keyword}</span>
                                     </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_5} alt="需求" />
                                             <img src={demand_ico_5} alt="需求" />
                                         </span>
                                         </span>
-                                        <span className="detial_sub_title">需求描述: </span>
-                                        <span className="detial_sub_text">{item.problemDes}</span>
+                                        <span className="detail_sub_title">需求描述: </span>
+                                        <span title={item.problemDes} className="detail_sub_demandDes">{item.problemDes}</span>
                                     </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_3} alt="预算" />
                                             <img src={demand_ico_3} alt="预算" />
                                         </span>
                                         </span>
-                                        <span className="detial_sub_title">预算: </span>
+                                        <span className="detail_sub_title">预算: </span>
                                         <span className="money_text">{item.budgetCost ? item.budgetCost + ' 万元' : '价格面议'}</span>
                                         <span className="money_text">{item.budgetCost ? item.budgetCost + ' 万元' : '价格面议'}</span>
                                     </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_2} alt="类型" />
                                             <img src={demand_ico_2} alt="类型" />
                                         </span>
                                         </span>
-                                        <span className="detial_sub_title">类型: </span>
-                                        <span className="detial_sub_text">{getDemandType(item.demandType)}</span>
+                                        <span className="detail_sub_title">类型: </span>
+                                        <span className="detail_sub_text">{getDemandType(item.demandType)}</span>
                                     </div>
                                     </div>
-                                    <div className="detial_sub">
-                                        <span className="detial_sub_icon">
+                                    <div className="detail_sub">
+                                        <span className="detail_sub_icon">
                                             <img src={demand_ico_1} alt="行业" />
                                             <img src={demand_ico_1} alt="行业" />
                                         </span>
                                         </span>
-                                        <span className="detial_sub_title">行业: </span>
-                                        <span className="detial_sub_text">{getIndustryCategory(item.industryCategoryA, item.industryCategoryB)}</span>
+                                        <span className="detail_sub_title">行业: </span>
+                                        <span className="detail_sub_text">{getIndustryCategory(item.industryCategoryA, item.industryCategoryB)}</span>
                                     </div>
                                     </div>
                                 </li>
                                 </li>
                             })}
                             })}