outaozhen 5 роки тому
батько
коміт
6e7b53b830

+ 3 - 1
src/product/index.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Product from './product';
+import { Provider } from 'react-redux';
+import store from './store';
 
 const App=(
 <Provider store={store}>
-<Contact />
+<Product />
 </Provider>
 )
 

+ 1 - 1
src/product/lock_count/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 import { BrowserRouter, Route,Link } from 'react-router-dom';
 

+ 1 - 1
src/product/lock_store/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 import { BrowserRouter, Route,Link } from 'react-router-dom';
 

+ 59 - 81
src/product/product.js

@@ -1,6 +1,8 @@
 import React, { Component } from 'react';
-import { Provider } from 'react-redux';
-import Store from './store';
+import { Provider,connect } from 'react-redux';
+import { BrowserRouter, Route,Link } from 'react-router-dom';
+import store from './store';
+import { actionCreators } from './common/store';
 import Lockcount from './lock_count';
 import Lockstore from './lock_store';
 
@@ -15,94 +17,70 @@ class product extends Component {
       // <Provider store={store}>
          
         <BrowserRouter>
-          <aside class="page-sidebar">
-        <div class="page-logo">
-          <a href="#modal-shortcut" class="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal">
-            <div class="icon-stack fa-2x">
-              <i class="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
-              <i class="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
-              <i class="fal fa-box icon-stack-1x opacity-100 color-white"></i>
+          <aside className="page-sidebar">
+        <div className="page-logo">
+          <a href="#modal-shortcut" className="page-logo-link press-scale-down d-flex align-items-center position-relative" data-toggle="modal">
+            <div className="icon-stack fa-2x">
+              <i className="base base-7 icon-stack-3x opacity-100 color-danger-900 "></i>
+              <i className="base base-4 icon-stack-2x opacity-100 color-danger-600 "></i>
+              <i className="fal fa-box icon-stack-1x opacity-100 color-white"></i>
             </div>
-            <span class="page-logo-text mr-1">产品</span>
-            <span class="position-absolute text-white opacity-50 small pos-top pos-right mr-2 mt-n2"></span>
-            <i class="ni ni-my-apps d-inline-block ml-1 fs-lg color-primary-300"></i>
+            <span className="page-logo-text mr-1">产品</span>
+            <span className="position-absolute text-white opacity-50 small pos-top pos-right mr-2 mt-n2"></span>
+            <i className="ni ni-my-apps d-inline-block ml-1 fs-lg color-primary-300"></i>
           </a>
         </div>
         {/* <!-- 侧栏主菜单 --> */}
-        <nav id="js-primary-nav" class="primary-nav" role="navigation">
-                        <ul id="js-nav-menu" class="nav-menu">
-                            <li class="active open">
-                                <a href="#" title="软件锁" data-filter-tags="软件锁" class="waves-effect waves-themed">
-                                    <i class="fal fa-magic "></i>
-                                    <span class="nav-link-text">软件锁</span>
-                                </a>
-                                <ul>
-                                    <li class="active">
-                                        <a href="lock-client.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
-                                            <span class="nav-link-text">公共锁库</span>
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <a href="lock-ccount.html" title="Marketing Dashboard" data-filter-tags="application intel marketing dashboard">
-                                            <span class="nav-link-text">使用统计</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                            </li>
-                            <li class="">
-                                <a href="#" title="Application Intel" data-filter-tags="application intel">
-                                    <i class="fal fa-cloud "></i>
-                                    <span class="nav-link-text">云版管理</span>
-                                </a>
-                                <ul>
-                                    <li>
-                                        <a href="intel_analytics_dashboard.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
-                                            <span class="nav-link-text">养护云版</span>
-                                        </a>
-                                    </li>
-                                    <li>
-                                        <a href="intel_marketing_dashboard.html" title="Marketing Dashboard" data-filter-tags="application intel marketing dashboard">
-                                            <span class="nav-link-text">建筑云版</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                        <div class="filter-message js-filter-message bg-success-600"></div>
-                    </nav>
-        {/* <!-- END 侧栏主菜单 --> */}
-        {/* <!--侧栏底部菜单--> */}
-        <div class="nav-footer shadow-top">
-          <a href="#" onclick="return false;" data-action="toggle" data-class="nav-function-minify" class="hidden-md-down">
-     					<i class="ni ni-chevron-right"></i>
-     					<i class="ni ni-chevron-right"></i>
-     				</a>
-          <ul class="list-table m-auto nav-footer-buttons">
-            <li>
-              <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Chat logs">
-     							<i class="fal fa-comments"></i>
-     						</a>
-            </li>
-            <li>
-              <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Support Chat">
-     							<i class="fal fa-life-ring"></i>
-     						</a>
-            </li>
-            <li>
-              <a href="javascript:void(0);" data-toggle="tooltip" data-placement="top" title="" data-original-title="Make a call">
-     							<i class="fal fa-phone"></i>
-     						</a>
-            </li>
+        <nav id="js-primary-nav" className="primary-nav" role="navigation">
+          <ul id="js-nav-menu" className="nav-menu">
+              <li className="active open">
+                  <a href="#" title="软件锁" data-filter-tags="软件锁" className="waves-effect waves-themed">
+                      <i className="fal fa-magic "></i>
+                      <span className="nav-link-text">软件锁</span>
+                  </a>
+                  <ul>
+                      <li className={menuActive=='lock_store'?'active':''} onClick={()=>handleMenuActive('lock_store')} >
+                        <Link to='/lock_store'>
+                          <span className="nav-link-text">公共锁库 {} </span>
+                        </Link>
+                      </li>
+                      <li className={menuActive=='lock_count'?'active':''} onClick={()=>handleMenuActive('lock_count')} >
+                        <Link to='/lock_count'>
+                          <span className="nav-link-text">使用统计 {} </span>
+                        </Link>
+                      </li>
+                  </ul>
+              </li>
+              <li className="">
+                  <a href="#" title="Application Intel" data-filter-tags="application intel">
+                      <i className="fal fa-cloud "></i>
+                      <span className="nav-link-text">云版管理</span>
+                  </a>
+                  <ul>
+                      <li>
+                          <a href="intel_analytics_dashboard.html" title="Analytics Dashboard" data-filter-tags="application intel analytics dashboard">
+                              <span className="nav-link-text">养护云版</span>
+                          </a>
+                      </li>
+                      <li>
+                          <a href="intel_marketing_dashboard.html" title="Marketing Dashboard" data-filter-tags="application intel marketing dashboard">
+                              <span className="nav-link-text">建筑云版</span>
+                          </a>
+                      </li>
+                  </ul>
+              </li>
           </ul>
-        </div>
+          <div className="filter-message js-filter-message bg-success-600"></div>
+      </nav>
+        {/* <!-- END 侧栏主菜单 --> */}
       </aside>
 
-      {/* <div className="page-content-wrapper">
+      <div className="page-content-wrapper">
                
-        <Route path='/product' exact component={Client} ></Route>
-        <Route path='/product/lock_store' exact render={()=><div>使用统计</div>} ></Route>
+        <Route path='/product' exact component={Lockstore} ></Route>
+        <Route path='/product/lock_count' exact component={Lockcount} ></Route>
                
-      </div> */}
+      </div>
         </BrowserRouter>
         
       // </Provider>