Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/baseComponents/TableBaseComponent/index.js

@@ -417,7 +417,6 @@ class TableBaseComponent extends ComponentBase {
   实际加载表数据
    */
   doLoadTableData = (loadParamJson, tableCode, onComplete, onLoadData) => {
-    console.log('调用查询实际过程', 6);
     const payloadJson = this.getLoadTableDataParams(loadParamJson, tableCode);
     if (!payloadJson) return;
 
@@ -426,7 +425,6 @@ class TableBaseComponent extends ComponentBase {
     }
     const tableConfig = this.getTableConfig({ tableCode });
     const { api } = tableConfig ? tableConfig : {};
-    console.log('调用查询实际过程', 7, api);
 
     this.props.dispatch({
       type: 'listPage/getTableData',

src/components/CustomPages/FO/FO043ShowPrint.js

@@ -1,5 +1,5 @@
 import { message } from "antd/lib/index";
-import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select, Table } from 'antd';
+import { Button, Descriptions, Popconfirm, Row, Col, Form, Input, Select,Modal, Table } from 'antd';
 import React from 'react';
 import { initFilter, extendRule, extendInclude, extendIgnoreDataRule, setDataFieldValue, guid, initQueryFilter, showFiles, GetFileModel, showUserSign } from "../../../utils/common";
 import ReactToPrint from "react-to-print";
@@ -292,6 +292,9 @@ class FO043ShowPrint extends React.Component {
 
                 }
             </div>
+            {
+                GetFileModel(Modal, FormPage, this, this.state.fileForm.visible)
+            }
         </div>
     }
 

src/feui/search/AdvanceSearch.js

@@ -297,7 +297,6 @@ class AdvanceSearch extends Component {
    */
   handleSearch = (self = true) => {
     if (this.setShareIns(self)) return
-    console.log('调用查询开始', 1)
     const { onSearch } = this.props
     onSearch instanceof Function && onSearch()
   }

src/index.js

@@ -85,4 +85,10 @@ app.router(require('./router').default);
 // 5. Start
 app.start('#root');
 
-window.g_app = app;
+window.g_app = app;
+
+const { localStorage } = window
+for (let i = 0; i < localStorage.length; i++) {
+  const key = localStorage.key(i)
+  key.indexOf('_requestKey') > -1 && localStorage.removeItem(key)
+}

src/layout/FullOther/HiddenSolve.js

@@ -250,9 +250,9 @@ class HiddenSolve extends React.Component {
 
     const companyNames = hiddenRectifyList.map((item) => item.companyName);
     const majorTotal = hiddenRectifyList.map((item) => item.majorCount);
-    const majorRectified = hiddenRectifyList.map((item) => (item.majorCount || 0) - (item.majorCountNo || 0));
+    const majorRectified = hiddenRectifyList.map((item) => item.majorCountNo);
     const generalTotal = hiddenRectifyList.map((item) => item.generalCount);
-    const generalRectified = hiddenRectifyList.map((item) => (item.generalCount || 0) - (item.generalCountNo || 0));
+    const generalRectified = hiddenRectifyList.map((item) => item.generalCountNo);
 
     const option = {
       title: {

src/layout/FullOther/HomeContent.js

@@ -374,6 +374,7 @@ class HomeContent extends React.Component {
           },
           label: { show: true, position: 'top', textStyle: { color: '#000', fontSize: 12 }, formatter: '{c}' },
           barWidth: '60%',
+          barMaxWidth: 40,
         },
       ],
     };

src/models/listPage.js

@@ -22,11 +22,8 @@ export default {
       return ret
     },
     *getTableData ({ payload, url, onComplete }, { call, put }) {
-      console.log('执行前',appService.getTableData)
       const ret = yield call(appService.getTableData, { payload, url })
-      console.log('执行后')
       if (typeof onComplete === 'function') {
-        console.log('执行后',ret)
         onComplete(ret)
       }
       return ret