Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

yee 7 years ago
parent
commit
7ebe66508d

+ 5 - 0
bin/clean.js

@@ -0,0 +1,5 @@
+const del = require('del');
+ 
+del(['build/*']).then(paths => {
+    console.log('Deleted files and folders:\n', paths.join('\n'));
+});

+ 448 - 0
css/base.less

@@ -1,3 +1,451 @@
+/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in
+ *    IE on Windows Phone and in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in IE.
+ */
+
+figcaption,
+figure,
+main { /* 1 */
+  display: block;
+}
+
+/**
+ * Add the correct margin in IE 8.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ */
+
+a {
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57- and Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
+ */
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Add the correct background and color in IE 9-.
+ */
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Remove the border on images inside links in IE 10-.
+ */
+
+img {
+  border-style: none;
+}
+
+/**
+ * Hide the overflow in IE.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Remove the default vertical scrollbar in IE.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}
+
 body {
     color: #333;
     font-size: 14px;

+ 3 - 2
js/component/account/services/evaluate/index.jsx

@@ -4,6 +4,7 @@ import Moment from 'moment';
 import './index.less';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
+import money from '../../../money.js';
 
 const Evaluate = React.createClass({
   getInitialState() {
@@ -101,7 +102,7 @@ const Evaluate = React.createClass({
   preview(e, it) {
     e.stopPropagation();
     e.preventDefault();
-    message.success('3级用户才能查看评估报告!');
+    window.open(globalConfig.context + '/user/account/evaluateInfo?id=' + it.id);
   },
   render() {
     const rowSelection = {
@@ -126,7 +127,7 @@ const Evaluate = React.createClass({
         title: '价值',
         dataIndex: 'value',
         key: 'value',
-        render: (text, it) => { return it.value || ''; }
+        render: (text, it) => { return it.value ? money(it.value) : ''; }
       }, {
         title: '预览',
         dataIndex: 'preview',

File diff suppressed because it is too large
+ 468 - 0
js/component/account/services/evaluate/info.jsx


+ 57 - 0
js/component/account/services/evaluate/info.less

@@ -0,0 +1,57 @@
+.report-container {
+  width: 990px;
+  margin: auto;
+  line-height: 1.5;
+  font-size: 14px;
+  color: #333;
+}
+
+.report-title {
+  text-align: center;
+  font-size: 24px;
+  font-weight: bold;
+}
+
+.report-subtitle {
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.report-page {
+  height: 700px;
+  padding: 30px 175px;
+  position: relative;
+  p {
+    margin: 4px 0;
+  }
+  .ant-table-wrapper {
+    margin-bottom: 16px;
+  }
+}
+
+.report-info {
+  margin: 115px 0;
+  .ant-row {
+    margin: 4px 0;
+  }
+}
+.report-announce {
+  position: absolute;
+  bottom: 30px;
+  left: 0;
+  width: 100%;
+  color: #999;
+  text-align: center;
+  font-size: 12px;
+}
+.report-pageno {
+  position: absolute;
+  bottom: 6px;
+  left: 0;
+  width: 100%;
+  color: #999;
+  text-align: center;
+  font-size: 12px;
+}

+ 5 - 3
js/component/account/services/evaluate/steps/step8.jsx

@@ -24,7 +24,7 @@ const getText = (map, key, field) => {
   if (field) {
     return map[key] ? (map[key][field || 'text'] || '') : key;
   }
-  return map[key] ? (map[key] || '') : key;
+  return map[key] ? map[key] : key;
 }
 
 const EvaluateStep8 = Form.create({})(React.createClass({
@@ -136,7 +136,9 @@ const EvaluateStep8 = Form.create({})(React.createClass({
         break;
     }
     cols.push({ title: '营业收入', dataIndex: 'income', key: 'income', render: (text) => { return money(text || 0) + '元' } });
-    cols.push({ title: '建议值', dataIndex: 'recommend', key: 'recommend', render: (text) => { return money(text || 0) + '元' } });
+    if(this.state.record[3].hasIncome=='2') {
+      cols.push({ title: '建议值', dataIndex: 'recommend', key: 'recommend', render: (text) => { return money(text || 0) + '元' } });
+    }
     return cols;
   },
   step1Data() {
@@ -343,7 +345,7 @@ const EvaluateStep8 = Form.create({})(React.createClass({
         </div>
         <div className="steps-action">
           {
-            value ? <Button type="primary" onClick={() => message.success('3级用户才能查看评估报告!')}>查看评估报告</Button>
+            value ? <Button type="primary" onClick={() => window.open(globalConfig.context + '/user/account/evaluateInfo?id=' + this.props.id)}>查看评估报告</Button>
               : <Button type="primary" onClick={this.calc}>确认表单,开始估值</Button>
           }
           <Button style={{ marginLeft: 8 }} onClick={() => this.prev()}>上一步</Button>

+ 12 - 0
js/user/account/evaluateInfo.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import '../../../css/base.less';
+
+import Content from '../../component/account/services/evaluate/info.jsx';
+
+ReactDOM.render(
+    <div className="wrap clearfix">
+        <Content />
+    </div>,
+    document.getElementById('root')
+)

+ 9 - 5
package.json

@@ -9,10 +9,10 @@
     "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://afts.hnzhiming.com'",
     "dllstage": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy stage --env.host 'http://aftts.hnzhiming.com'",
     "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://static.goafanti.com'",
-    "build": "webpack --progress --colors --env.deploy dev",
-    "buildtest": "webpack --progress --colors --env.deploy test",
-    "buildstage": "webpack --progress --colors --env.deploy stage",
-    "pro": "webpack --progress --colors --env.deploy prod",
+    "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
+    "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
+    "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
+    "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
     "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
@@ -29,6 +29,7 @@
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-react": "^6.23.0",
     "css-loader": "^0.26.2",
+    "del": "^3.0.0",
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.10.1",
     "html-webpack-plugin": "^2.28.0",
@@ -45,8 +46,11 @@
   },
   "dependencies": {
     "antd": "^2.5.2",
+    "echarts": "^3.6.2",
     "jquery": "^3.1.1",
+    "prop-types": "^15.5.10",
     "react": "^15.4.1",
-    "react-dom": "^15.4.1"
+    "react-dom": "^15.4.1",
+    "echarts-for-react": "^1.4.4"
   }
 }

+ 6 - 1
webpack.config.js

@@ -99,7 +99,12 @@ module.exports = (function () {
             template: './template/template.html',
             chunks: ['user/account/demand', 'vendors']
         }),
-
+        new HtmlWebpackPlugin({
+            title: '管理员-科技服务管理-科技评估信息',
+            filename: 'user/account/evaluateInfo.html',
+            template: './template/template.html',
+            chunks: ['user/account/evaluateInfo', 'vendors']
+        }),
         //admin
         new HtmlWebpackPlugin({
             title: '管理员-首页',

+ 5 - 0
webpack/entry.config.js

@@ -13,6 +13,7 @@ module.exports = {
     'user/account/services': './js/user/account/services.js',
     'user/account/achievement': './js/user/account/achievement.js',
     'user/account/demand': './js/user/account/demand.js',
+    'user/account/evaluateInfo': './js/user/account/evaluateInfo.js',
     //admin
     'admin/index': './js/admin/index.js',
     'admin/login': './js/admin/login.js',
@@ -75,6 +76,10 @@ module.exports = {
       'webpack/hot/only-dev-server',
       './js/user/account/achievement.js'
     ],
+    'user/account/evaluateInfo': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+      'webpack/hot/only-dev-server',
+      './js/user/account/evaluateInfo.js'
+    ],
     'user/account/demand': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
       'webpack/hot/only-dev-server',
       './js/user/account/demand.js'