Home Explore Help
Register Sign In
usoft
/
kanban-client
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

【看板客户端】【小改动】

zhuth 8 years ago
parent
ea4c843699
commit
bb07db7a69
4 changed files with 6 additions and 5 deletions
Unified View Show Diff Stats
  1. 3 2
      kanban-client/app/component/factory.js
  2. 2 1
      kanban-client/app/utils/RenderUtils.js
  3. 1 1
      kanban-client/build/index.html
  4. 0 1
      kanban-client/src/Title/Title.jsx

+ 3 - 2
kanban-client/app/component/factory.js
View File 

@@ -8,6 +8,7 @@ import RenderUtils from '../utils/RenderUtils.js';
 
 import config1 from '../data/BoardConfig3.json';
 
 import config1 from '../data/BoardConfig3.json';
 
 import config2 from '../data/BoardConfig4.json';
 
 import config2 from '../data/BoardConfig4.json';
 
 
 
+
 
 class Factory extends React.Component {
 
 class Factory extends React.Component {
 
 
 
     constructor(props) {
 
     constructor(props) {
 
@@ -32,10 +33,10 @@ class Factory extends React.Component {
 
         return (
 
         return (
 
             <div>
 
             <div>
 
                 <div>
 
                 <div>
 
-                    <Title {...this.state.config.title.config} state={{time1: new Date().format('hh:mm:ss'),time2: 60-new Date().getSeconds(),}} />
 
+                    <Title {...this.state.config.title.config} />
 
                 </div>
 
                 </div>
 
                 <div>
 
                 <div>
 
-                    <Container items={this.state.config.content.items} rowHeight={(window.innerHeight - this.state.config.title.config.height) / 10} />
 
+                    <Container items={this.state.config.content.items} rowHeight={(window.innerHeight - this.state.config.title.config.height || 55) / 10} />
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
         );
 
         );

+ 2 - 1
kanban-client/app/utils/RenderUtils.js
View File 

@@ -1,4 +1,5 @@
 
 import React from 'react';
 
 import React from 'react';
 
+import logeImg from '../../assets/images/log.png';
 
 
 
 function titleRender(state) {
 
 function titleRender(state) {
 
     let time1 = new Date().format('HH:mm:ss');
 
     let time1 = new Date().format('HH:mm:ss');
 
@@ -7,7 +8,7 @@ function titleRender(state) {
 
             <thead>
 
             <thead>
 
             <tr>
 
             <tr>
 
                 <td className="logo" width="320" rowSpan="2">
 
                 <td className="logo" width="320" rowSpan="2">
 
-                    <img src={require('../../assets/images/log.png')} alt=""/>
 
+                    <img src={logeImg} alt=""/>
 
                 </td>
 
                 </td>
 
                 <td className="title-center" width="550" rowSpan="2">产线ASS02ZZ电子看板 <br/>Production Line Overview</td>
 
                 <td className="title-center" width="550" rowSpan="2">产线ASS02ZZ电子看板 <br/>Production Line Overview</td>
 
                 <td className="title-field" width="210">
 
                 <td className="title-field" width="210">

+ 1 - 1
kanban-client/build/index.html
View File 

@@ -6,7 +6,7 @@
 
 </head>
 
 </head>
 
 <body style="margin:0px">
 
 <body style="margin:0px">
 
   <div id="root"></div>
 
   <div id="root"></div>
 
-  <script type="text/javascript" src="../lib/echarts-for-react/echarts.min.js"></script>
 
+  <script type="text/javascript" src="./lib/echarts-for-react/echarts.min.js"></script>
 
   <script src="bundle.js"></script>
 
   <script src="bundle.js"></script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 1
kanban-client/src/Title/Title.jsx
View File 

@@ -40,7 +40,6 @@ export default class Title extends React.Component {
 
   getTitle() {
 
   getTitle() {
 
     const { render, height, width, cls, style} = this.props;
 
     const { render, height, width, cls, style} = this.props;
 
     style.height = height;
 
     style.height = height;
 
-    console.log(height)
 
     let tel;
 
     let tel;
 
     if (renders[render]) {
 
     if (renders[render]) {
 
       tel = <div className={cls} style={style}>{renders[render](this.props.state)}</div>;
 
       tel = <div className={cls} style={style}>{renders[render](this.props.state)}</div>;