src/components/Custom/CustomPage.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import { connect } from 'dva'
 import { initFilter, getCustomParams } from "../../utils/common"
-//import loadPage from '../../utils/customConfig1'//便捷开发 请勿提交
+import loadPage from '../../utils/customConfig'//便捷开发 请勿提交
-import loadPage from '../../utils/customConfig' 
+//import loadPage from '../../utils/customConfig' 
 
 class CustomPage extends React.Component {
   constructor(props) {

src/components/CustomPages/FM/RoleEditPage.js

@@ -724,21 +724,6 @@ class RoleEditPage extends React.Component {
                 }
               </Form.Item>
             </Col>
-            <Col span={12}>
-              <Form.Item label={'默认角色'} help={'若【是】导入用户时会默认添加此角色'}>
-                {
-                  getFieldDecorator('ISDEFAULT', {
-                    validateTrigger: 'onBlur',
-                    initialValue: (this.state.data.ISDEFAULT ? this.state.data.ISDEFAULT.toString() : 'false'),
-                  })(
-                    <Select placeholder='数据类型'>
-                      <Option value='false'>否</Option>
-                      <Option value='true'>是</Option>
-                    </Select>
-                  )
-                }
-              </Form.Item>
-            </Col>
             <Col span={12}>
               <Form.Item label={'备注'}>
                 {

src/components/CustomPages/SC/SC022Import.js

@@ -139,20 +139,17 @@ class SC022Import extends React.Component {
                                     </Button>
                                 </Upload>
                             </td>
-                            <td colSpan={16}>
-                               
-                            </td>
                         </tr>
                         {
                             isMsgShow ? (
                                 isOk ? <tr >
-                                    <td colSpan={18}>
+                                    <td colSpan={2}>
                                         {Msg}
                                     </td>
                                 </tr>
                                     :
                                     <tr style={{ color: 'red' }}>
-                                        <td colSpan={18}>
+                                        <td colSpan={2}>
                                             {Msg}
                                         </td>
                                     </tr>

src/components/CustomPages/SE/SE018EditPage.js

@@ -279,7 +279,7 @@ class SE018EditPage extends React.Component {
                             <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训老师</td>
                             <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify ? data.Nav_Notify.TRAIN_TEACHER : null}</td>
                             <td colSpan={4} rowSpan={1} className={styles.fontBold}>培训形式</td>
-                            <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td>
+                            <td colSpan={4} rowSpan={1} >{data&& data.Nav_Notify  && data.Nav_Notify.TRAINTYPE && enums.TrainType.enums[data.Nav_Notify.TRAINTYPE]}</td>
                             <td colSpan={4} rowSpan={1} className={styles.fontBold}>考核方式</td>
                             {/* <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.Nav_TrainCheckType ? data.Nav_Notify.Nav_TrainCheckType.NAME : null}</td> */}
                             <td colSpan={4} rowSpan={1} >{data && data.Nav_Notify && data.Nav_Notify.CHECKTYPE && enums.PlanCheckType.enums[data.Nav_Notify.CHECKTYPE]}</td>
@@ -364,7 +364,7 @@ class SE018EditPage extends React.Component {
                                     <td colSpan={4} rowSpan={1} className={styles.fontBold}>姓名</td>
                                     <td colSpan={4} rowSpan={1} className={styles.fontBold}>岗位</td>
                                     {this.state.isExam && <td colSpan={4} rowSpan={1} className={styles.fontBold}>分数</td>}
-                                    {!signable && <td colSpan={4} rowSpan={1} className={styles.fontBold} style={{ display: this.state.isShow }}>查看试卷</td>}
+                                    <td colSpan={4} rowSpan={1} className={styles.fontBold} style={{ display: this.state.isShow }}>查看试卷</td>
                                     <td colSpan={6} rowSpan={1} className={styles.fontBold}>电子签名</td>
                                 </tr>
                                 {
@@ -381,13 +381,12 @@ class SE018EditPage extends React.Component {
                                             {/* if (data.Nav_Notify.CHECKTYPE == 51 || data.Nav_Notify.CHECKTYPE == 56 || data.Nav_Notify.CHECKTYPE == 81) { */}
                                             {/* 线上考核 51  看试卷     56 81 看附件 */}
                                             {
-                                                !signable && (
+                                                this.state.isShow && data.Nav_Notify.CHECKTYPE ? (
-                                                    this.state.isShow && data.Nav_Notify.CHECKTYPE ? (
+                                                    data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1}  ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
-                                                        data.Nav_Notify.CHECKTYPE == 51 ? <td colSpan={4} rowSpan={1}  ><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
+                                                        : <td colSpan={4} rowSpan={1}  >  {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td>
-                                                            : <td colSpan={4} rowSpan={1}  >  {showFiles(it?.Nav_Files, config.picServerHost, this, false)}</td>
+                                                )
-                                                    )
+                                                    : <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
-                                                        : <td colSpan={4} rowSpan={1} style={{ display: this.state.isShow }}><div onClick={() => this.showDetailModal(it.RECORD_ID, it.USER_ID)}><Icon type="eye" style={{ color: "#005b9b", cursor: "pointer" }} /></div></td>
+                                            }
-                                                )}
                                             <td colSpan={6} rowSpan={1}>
                                                 {
                                                     showUserSign(it.Nav_User, config.picServerHost)

src/components/CustomPages/SE/SE018PaperPage.js

@@ -333,15 +333,15 @@ class SE018PaperPage extends React.Component {
                 }
             }
 
-            if (this.state.filepath && this.state.filepath.length > 0 && this.state.filepath.indexOf('/VIDEO/') > -1) {
+            if (this.state.filepath.indexOf('/VIDEO/') > -1) {
                 this.state.isViedo = true
                 this.state.filepath = configc.videoServerHost + this.state.filepath
                 this.state.filepathf = []
                 if (ISEND && VIEWSEC == 0) {
                     ISEND = false
                 }
-            } else if (this.state.filepath && this.state.filepath.length > 0 && (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath
+            } else if (this.state.filepath.indexOf('.mp4') > -1 || this.state.filepath
-                .indexOf('.avi') > -1)) {
+                .indexOf('.avi') > -1) {
                 //暂时不应该进来 
                 this.state.isViedo = true
                 if (ISEND) {
@@ -354,9 +354,7 @@ class SE018PaperPage extends React.Component {
                 this.state.isViedo = false
                 // this.state.isVideoEnd = true
                 this.state.filepath = this.state.filepath
-                if (this.state.filepath && this.state.filepath.length > 0) {
+                this.state.filepathf = getFileShow(this.state.filepath)
-                    this.state.filepathf = getFileShow(this.state.filepath)
-                }
             }
             this.setState({
                 indexCour: this.state.indexCour,
@@ -736,7 +734,7 @@ class SE018PaperPage extends React.Component {
                                 </tr> : null
                             }
                             {
-                                isCourEdit && !isViedo && filepathf && filepathf.length > 0 ? <tr >
+                                isCourEdit && !isViedo ? <tr >
                                     <td colSpan={4} rowSpan={1} className={styles.fontBold}>课件附件</td>
                                     <td colSpan={20} rowSpan={1} className={styles.fontBold}>
                                         {

src/components/CustomPages/SE/SE071ShowPrint.js

@@ -64,7 +64,6 @@ class SE071ShowPrint extends React.Component {
         extendInclude(json, 'Nav_ListPlanDetail.Nav_Department')
         extendInclude(json, 'Nav_ListPlanDetail.Nav_ListDetailDepartment.Nav_Department')
         extendInclude(json, 'Nav_ListPlanDetail.Nav_TrainTypeEnum')
-        extendInclude(json, 'Nav_ListPlanDetail.Nav_ApproveRole')
         extendInclude(json, "Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser");
         this.props.dispatch({
             type: 'app/getDataByPost',
@@ -122,11 +121,10 @@ class SE071ShowPrint extends React.Component {
                         <table className={styles.PrintFormLight}>
                             <tbody>
                                 <tr>
-                                    <td colSpan={11} className={styles.showPrintHead2}>年度培训计划详情</td>
+                                    <td colSpan={10} className={styles.showPrintHead2}>年度培训计划详情</td>
                                 </tr>
                                 <tr className={styles.PrintFormLightTh}>
                                     <td>月份</td>
-                                    <td>触发日期</td>
                                     <td>培训性质</td>
                                     <td>培训类型</td>
                                     <td>培训名称</td>
@@ -135,7 +133,6 @@ class SE071ShowPrint extends React.Component {
                                     <td>考核方式</td>
                                     <td>培训学时</td>
                                     <td>培训组织</td>
-                                    <td>培训角色</td>
                                     {/* <td>培训老师</td> */}
                                     {
                                         data.TYPE != 5 ?
@@ -146,7 +143,6 @@ class SE071ShowPrint extends React.Component {
                                 {data?.Nav_ListPlanDetail?.map((item, i) => {
                                     return <tr>
                                         <td>{item.MONTH} </td>
-                                        <td>{item.DATE_TRAIN?.split(' ')[0]} </td>
                                         <td>{enums.TrainInOut.enums[item.IN_OUT]} </td>
                                         <td>{item.Nav_TrainTypeEnum.NAME} </td>
                                         <td>{item.NAME} </td>
@@ -155,7 +151,6 @@ class SE071ShowPrint extends React.Component {
                                         <td>{enums.PlanCheckType.enums[item.CHECKTYPE]} </td>
                                         <td>{item.CLASSHOUR} </td>
                                         <td>{item.Nav_Department.NAME} </td>
-                                        <td>{item.Nav_ApproveRole?.NAME} </td>
                                         {
                                             data.TYPE != 5 ?
                                                 <td>{item.Nav_ListDetailDepartment?.map((itemtype, j) => { return (j > 0 ? '，' : '') + itemtype.Nav_Department.NAME })}</td>
@@ -168,7 +163,7 @@ class SE071ShowPrint extends React.Component {
 
                                 <tr>
                                     <td>审批详情</td> {/* 审核意见 如果已经审批 显示审批信息 */}
-                                    <td colSpan={11} style={{ textAlign: "left" }}>
+                                    <td colSpan={9} style={{ textAlign: "left" }}>
                                         {
                                             showApprove(data.Nav_Approve?.Nav_ApproveDetails, enums.NodeApproveStatus.enums, config.picServerHost, 200)
                                         }

src/components/CustomPages/SE/SEConfigPage.js

@@ -7,7 +7,6 @@ import { connect } from 'dva';
 import moment from 'moment';
 
 class SEConfigPage extends React.Component {
-
     constructor(props) {
         super(props);
         this.state = {
@@ -27,16 +26,12 @@ class SEConfigPage extends React.Component {
                 DEP_TRAIN_PLAN_START_TIME: null,
                 DEP_TRAIN_PLAN_END_TIME: null,
                 TRAIN_SURVEY_TRIGGER_TIME: null,
-                APPROVAL_ROLE_ID: null,
-                optionsSelect: null
             },
         };
-
     };
 
     componentDidMount() {
-        this.ini();
+        this.loadData();
-        // this.loadData();
     }
     BtnClose = () => {
         if (typeof this.props.closeFn != "undefined")
@@ -47,24 +42,6 @@ class SEConfigPage extends React.Component {
             this.props.onCancel();
         }
     }
-    ini = () => {
-        let json = initFilter(this.props.login.OrgId);
-        json.Parameter22 = this.props.data.ORG_ID_HV;
-        var that = this
-        this.props.dispatch({
-            type: 'app/getDataByPost',
-            payload: json,
-            url: 'PF/ApprovalRole/Entities',
-            onComplete: (ret) => {
-                if (ret && ret.length > 0) {
-                    let data = this.state.data;
-                    data.optionsSelect = ret;
-                    this.setState(data)
-                    this.loadData()
-                }
-            }
-        });
-    }
     loadData = () => {
         let json = initFilter(this.props.login.OrgId);
         json.Parameter22 = this.props.data.ORG_ID_HV;
@@ -74,7 +51,6 @@ class SEConfigPage extends React.Component {
             url: 'SE/SEConfig/Entities',
             onComplete: (ret) => {
                 if (ret && ret.length > 0) {
-                    ret[0].optionsSelect = this.state.data.optionsSelect
                     this.setState({ data: ret[0] });
                 }
             }
@@ -115,11 +91,9 @@ class SEConfigPage extends React.Component {
             }
         });
     }
-
     render() {
         const { data } = this.state;
         const dateFormat = 'MM-DD';
-        const { Option } = Select;
         return <>
             <div style={{ padding: '10px' }}>
                 <Button style={{ marginLeft: '8px' }} onClick={() => this.onSave()} icon="save" type="primary" loading={this.state.isLoading}>保存</Button>
@@ -286,7 +260,7 @@ class SEConfigPage extends React.Component {
                     </tr>
                     <tr>
                         <td colSpan={4} rowSpan={1} >公司培训计划触发时间</td>
-                        <td colSpan={8} rowSpan={1} >
+                        <td colSpan={20} rowSpan={1} >
                             <DatePicker
                                 format={dateFormat}
                                 value={data.DEP_TRAIN_PLAN_START_TIME ? moment(data.DEP_TRAIN_PLAN_START_TIME) : null}
@@ -297,41 +271,8 @@ class SEConfigPage extends React.Component {
                                 }}
                             />
                         </td>
-                        <td colSpan={4} rowSpan={1} >接收角色</td>
-                        <td colSpan={8} rowSpan={1} >
-                            <Select
-                                showSearch
-                                style={{ width: 300 }}
-                                placeholder="请选择接收角色"
-                                value={data.APPROVAL_ROLE_ID}
-                                onChange={(value) => {
-                                    data.APPROVAL_ROLE_ID = value;
-                                    this.setState(data)
-                                }}
-                                filterOption={(input, option) =>
-                                    option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                                }
-                            >
-                                {data.optionsSelect?.map(item =>
-                                    (<Option key={item.ID} value={item.ID} label={item.NAME} >{item.NAME}</Option>)
-                                )}
-                            </Select>
-                        </td>
                     </tr>
 
-                    {/* 
-render: (text, record, index) => {
-                    return <Select value={text != "-1" ? text : ""} optionFilterProp='name' onChange={(e) => this.onSelectChange(e, record, 'PLATFORM_TYPE', index)}>
-                        {
-                            enums && enums.CMEvaluateStatusEnum && enums.CMEvaluateStatusEnum.options ? enums.CMEvaluateStatusEnum.options.map(t => {
-                                return <Option value={t.value}>{t.label}</Option>
-                            }) : null
-                        }
-                    </Select>;
-
-                     */}
-
-
                     {/* <tr>
                         <td colSpan={4} rowSpan={1} >部门培训计划发起时间</td>
                         <td colSpan={20} rowSpan={1} >

src/components/CustomPages/SK/SK004CheckListNew.js

@@ -24,7 +24,6 @@ class SK004CheckListNew extends React.Component {
       production: {},
       productionId: null,
       checkType: {},
-      checkTypeId:null,
       data: {},
       dataList: [],
       MineType: 0,
@@ -206,8 +205,8 @@ class SK004CheckListNew extends React.Component {
     if (this.state.inputText6) {
       temp = temp.filter(t => t.CheckCycle == this.state.inputText6);
     }
-    if (this.state.checkTypeId) {
+    if (this.state.inputText3) {
-      temp = temp.filter(t => t.CHECK_TYPE_ID == this.state.checkTypeId);
+      temp = temp.filter(t => t.CheckType == this.state.inputText3);
     }
     if (this.state.inputText4) {
       temp = temp.filter(t => t.CheckDepart.includes(this.state.inputText4));
@@ -341,7 +340,6 @@ class SK004CheckListNew extends React.Component {
         ID: data[0],
         NAME: record?.NAME,
       },
-      checkTypeId:record?.ID, 
       inputText3: record?.NAME
     })
   };
@@ -466,11 +464,11 @@ class SK004CheckListNew extends React.Component {
                 onChange={this.handleSearch3}
                 style={{ width: "150px" }}
               ></Input> */}
-            <DropDownPagination inputDataApi={'SK/SKCheckType/OrderPaged'} fieldName={'NAME'} inputShowField={'Nav_ProductionUnit.NAME,NAME'}
+            <DropDownPagination inputDataApi={'SK/SKCheckType/OrderPagedNew'} fieldName={'NAME'}
               data={this.state.checkType} onSelect={this.handleSearch3} onFilter={({ params }) => {
                 params.OrderType = 1
                 params.OrgId = this.props.login.OrgId
-                params.Keyword = this.state.productionId
+                params.Keyword = this.state.inputText
               }} />
           </Form.Item>
 

src/components/CustomPages/SK/SK016ShowPrint.js

@@ -46,7 +46,6 @@ class SK016ShowPrint extends React.Component {
         // extendRule(json, 'TASK_ID', 1, taskID);
         extendInclude(json, 'Nav_ApplyUser');
         extendInclude(json, 'Nav_ApplyDepartment');
-        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_RiskArea');
         extendInclude(json, 'Nav_ReportFiles');
         extendInclude(json, 'Nav_ReportFiles.Nav_ImgFile');

src/components/CustomPages/SK/SK018ShowPrint.js

@@ -63,7 +63,6 @@ class SK018ShowPrint extends React.Component {
         extendInclude(json, 'Nav_Report');
         extendInclude(json, 'Nav_ApplyUser');
         extendInclude(json, 'Nav_ApplyDepartment');
-        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_RiskArea');
         extendInclude(json, 'Nav_Photos');
         extendInclude(json, 'Nav_Photos.Nav_ImgFile');

src/components/CustomPages/SK/SK022ShowPrint.js

@@ -155,7 +155,7 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item label="整改部门">{data.Nav_RecitifyUser && data.Nav_RecitifyUser.Nav_Department ? data.Nav_RecitifyUser.Nav_Department.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人">{data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改落实人">{
-                                      (data.STATUS == 21 ||data.STATUS == 20 || data.STATUS == 10|| data.STATUS == 30)&&
+                                    data.STATUS == 21 &&
                                         data.Nav_ImplementUser && data.Nav_ImplementUser.FILE_PATH ?
                                         showUserSign(data.Nav_ImplementUser, config.picServerHost)
                                         : data.Nav_ImplementUser ? data.Nav_ImplementUser.NAME : ''}</Descriptions.Item>
@@ -176,13 +176,13 @@ class SK022ShowPrint extends React.Component {
                                 <Descriptions.Item style={{ display: (data.STATUS == 20 || data.STATUS == 30) ? "inline" : "none" }} label="验收结论">{enums.SKAcceptResultEnum.enums[data.ACCEPT_RESULTE]}</Descriptions.Item>
                                 <Descriptions.Item style={{ display: (data.STATUS == 20 || data.STATUS == 30) ? "inline" : "none" }} label="验收意见">{data.ACCEPT_OPINION}</Descriptions.Item>
                                 <Descriptions.Item label="整改责任人签名">{
-                                    (data.STATUS == 20 || data.STATUS == 10|| data.STATUS == 30) && data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
+                                    data.Nav_RecitifyUser && data.Nav_RecitifyUser.FILE_PATH ?
                                         showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                         : data.Nav_RecitifyUser ? data.Nav_RecitifyUser.NAME : ''
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="验收人签名">{
                                     (data.STATUS == 20 || data.STATUS == 30) && data.Nav_AcceptUser && data.Nav_AcceptUser.FILE_PATH ?
-                                        showUserSign(data.Nav_AcceptUser, config.picServerHost)
+                                        showUserSign(data.Nav_RecitifyUser, config.picServerHost)
                                         : data.Nav_AcceptUser ? data.Nav_AcceptUser.NAME : ''
                                 }</Descriptions.Item>
                             </Descriptions>

src/components/CustomPages/SK/SK080ShowPrint.js

@@ -105,15 +105,7 @@ class SK080ShowPrint extends React.Component {
                                 <Descriptions.Item label="发起部门">{data.Nav_ApplyDepartment ? data.Nav_ApplyDepartment.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="发起人">{data.Nav_ApplyUser ? data.Nav_ApplyUser.NAME : ''}</Descriptions.Item>
                                 <Descriptions.Item label="整改记录单编号">{data.Nav_RectifyRecord?data.Nav_RectifyRecord?.CODE:''}</Descriptions.Item>
-                                <Descriptions.Item label="生产单元">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_ProductionUnit?data.Nav_RectifyRecord.Nav_ProductionUnit.NAME:''}</Descriptions.Item>
+                                
-                                <Descriptions.Item label="检查区域">{data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RiskArea?data.Nav_RectifyRecord.Nav_RiskArea.NAME:''}</Descriptions.Item>
-                                <Descriptions.Item label="隐患地点">{data.Nav_RectifyRecord?data.Nav_RectifyRecord.HIDDEN_PLACE:''}</Descriptions.Item>
-                                <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotoas ? data.Nav_RectifyRecord.Nav_RectifyPhotoas:null, config.picServerHost, this)
-                                }</Descriptions.Item>
-                                <Descriptions.Item label="整改前照片">{
-                                    showFileImg(data.Nav_RectifyRecord && data.Nav_RectifyRecord.Nav_RectifyPhotobs ? data.Nav_RectifyRecord.Nav_RectifyPhotobs:null, config.picServerHost, this)
-                                }</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患名称">{data.HIDDEN_DESCRIPTION}</Descriptions.Item>
                                 <Descriptions.Item label="重大事故隐患形成原因分析">{data.HIDDEN_REASON}</Descriptions.Item>
                                 <Descriptions.Item label="实地复查负责人">{data.Nav_ChargeUser ? data.Nav_ChargeUser.NAME : ''}</Descriptions.Item>
@@ -125,7 +117,7 @@ class SK080ShowPrint extends React.Component {
                                     })
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="复查情况描述">{data.REVIEW_DESCRIPTION}</Descriptions.Item>
-                                <Descriptions.Item label="复查照片">{
+                                <Descriptions.Item label="附件">{
                                     showFileImg(data?.Nav_Files, config.picServerHost, this)
                                 }</Descriptions.Item>
                                 <Descriptions.Item label="复查结论">{enums.SKReviewResultEnum.enums[data.REVIEW_RESULT]}</Descriptions.Item>

src/config.js

@@ -25,7 +25,7 @@ const config = {
     flowServiceHost: "http://124.117.209.78:3188/",
     hmiUrl: "http://localhost:8060/",
     webSocketHost: 'ws://localhost:3140/',
-    picServerHost: 'http://localhost:5000/webImg',
+    picServerHost: 'http://localhost:5199',
     videoServerHost: 'https://sps.cxtc.com:3199',
     dataVUrl: "http://localhost:8062/home",
     version: version,
@@ -42,8 +42,8 @@ const config = {
     cookieDomain: "",
     hmiUrl: "http://124.117.209.78:8098/",
     webSocketHost: 'ws://124.117.209.78:3140/',
-    picServerHost: 'http://124.117.209.78:5000/webImg',
+    picServerHost: 'http://124.117.209.78:5199',
-    videoServerHost: 'http://124.117.209.78:5000/webImg',
+    videoServerHost: 'http://124.117.209.78:5199',
     dataVUrl: "http://124.117.209.78:3167/home",
     version: version,
     guideSeverHost: "http://124.117.209.78:5110/jyapk/",
@@ -59,8 +59,8 @@ const config = {
     cookieDomain: "",
     hmiUrl: "http://121.41.2.71:8098/",
     webSocketHost: 'ws://121.41.2.71:3140/',
-    picServerHost: 'http://121.41.2.71:5000/webImg',
+    picServerHost: 'http://121.41.2.71:5199',
-    videoServerHost: 'https://sps.cxtc.com:3199',
+    videoServerHost: 'http://121.41.2.71:5199',
     dataVUrl: "http://121.41.2.71:3167/home",
     version: version,
     guideSeverHost: "http://121.41.2.71/jyapk/",

src/files/edit/FO055.js

@@ -1,32 +0,0 @@
-import { message } from "antd/lib/index";
-import { getPropertyData, extendInclude, extendRule, getDataFieldValue, setDataFieldValue, initFilter, guid } from "../../utils/common";
-import moment from 'moment';
-/**
- * @return {string}
- */
-// 编辑
-export default {
-  onBeforeSaveHandleRecord(params) {
-    params.record.TaskID = params.data.TaskID    //TaskID传递消息表ID
-    params.record.PUBLISH = params.customParams;
-  },
-  onBeforeEdit: ({ isNew,login,record, dispatch,stateData,setRowFieldVisible, setFieldEditable,setFieldVisible,setFieldValue,setFieldValueByBatch }) => {
-    if (isNew) {
-        let json = initFilter(login.OrgId);
-        extendRule(json, "PARENT_ID", 1, null);
-        extendRule(json, "DEPARTMENT_TYPE", 1, 5);
-        dispatch({
-            type: 'app/getDataByPost',
-            url: 'FM/Department/Get',
-            payload: json,
-          onComplete: (ret) => {
-            if (ret) {
-                let temps = [];
-              temps.push({ field: 'COMPANY_NAME', value: ret.NAME })
-              setFieldValueByBatch(temps);
-            }
-          }
-        });
-      }
-  },
-}

src/files/edit/SK022.js

@@ -37,12 +37,6 @@ export default {
         setFieldVisible('ACCEPT_DATE', false);
         setFieldVisible('ACCEPT_RESULTE', false);
         setFieldVisible('ACCEPT_OPINION', false);
-      }else if(stateData.STATUS === 10)
-      {
-        setFieldVisible("CONTEXT", false);
-            setFieldVisible('ACCEPT_DATE', false);
-            setFieldVisible('ACCEPT_RESULTE', true);
-            setFieldVisible('ACCEPT_OPINION', true);
       }
         else
         {

src/utils/request.js

@@ -109,7 +109,6 @@ export function getRequestHeaders(url, type = 'post', data, isIgnoreTenant) {
   if (Tenant && Tenant == '003' && data && data.Parameter22 && data.Parameter22.length > 20) {
     //总公司 Parameter22 存入子公司的ORG_ID 自动切换数据库链接
     headers.Tenant = data.Parameter22.substring(0, 3)
-    data.IgnoreDataRule = true
   }
 
   return headers
@@ -131,20 +130,17 @@ export function httpPost(url, data, onlyData = true, ignoreThrottle, onException
   // 与 isIgnoreTenant 相关配套的逻辑
   const extraData = isIgnoreTenant ? { OrgId: '', IgnoreOrgRule: true } : {}
   //const dataStr = JSON.stringify(Object.assign({}, data, { DataRule, OrgRule, ...extraData }))
-  var headers = getRequestHeaders(url, 'post', data, isIgnoreTenant)
-  if (headers.Tenant == '003') {
-    data.IgnoreDataRule = true
-  }
   const dataStr = JSON.stringify(Object.assign({}, data, { OrgRule, ...extraData }))
   // 请求节流
   const requestKey = url + '_' + MD5(dataStr) + '_requestKey'
   const loaded = storage('lacal').getItem(requestKey).val
   if (loaded && !ignoreThrottle) return null
   storage('lacal').setItem(requestKey, true)
+
   // 发起请求
   return request(url, {
     method: 'POST',
-    headers: headers,// getRequestHeaders(url, 'post', data, isIgnoreTenant),
+    headers: getRequestHeaders(url, 'post', data, isIgnoreTenant),
     body: dataStr,
   }, onlyData, requestKey, onException)
 }
@@ -162,10 +158,6 @@ export function httpGet(url, data, onlyData = true, onException) {
   const searchMark = url.indexOf('?') !== -1
   const formUrl = `${url}${searchMark ? '&' : '?'}${formParams}`
   url = formParams ? formUrl : url
-  // var headers = getRequestHeaders(url, 'get', data)
-  // if (headers.Tenant == '003' && data) {
-  //   data.IgnoreDataRule = true
-  // }
   return request(url, {
     method: 'GET',
     headers: getRequestHeaders(url, 'get', data),