Merge remote-tracking branch 'origin/dev' into dev

src/components/BlockLossManage/editBlock.js

@@ -198,7 +198,7 @@ function EditBlock(props) {
                             取消
                         </Button>
                         <Button type="primary" htmlType="submit">
-                            保存
+                        {type == 3 ? '保存' : '确定'}
                         </Button>
                     </Space>
                 </Form.Item>

src/components/BlockLossManage/index.js

@@ -23,11 +23,7 @@ function BlockLossManage() {
     const [size, setSize] = useState(15);
     const [current, setCurrent] = useState(1);
     const [type, setType] = useState(null);
-    const [blockData, setBlockData] = useState({
-        pages: 1,
-        current: 1,
-        size: 15
-    });
+    const [blockData, setBlockData] = useState({});
     const [blockDetail, setBlockDetail] = useState(null);//详情数据
     const [params, setParams] = useState({
         pages: 1,
@@ -55,11 +51,7 @@ function BlockLossManage() {
         post(api.blockLossTypeGather, { startDate: startDate || params.startDate, endDate: endDate || params.endDate }).then((res) => {
             if (res.data.code === 200) {
                 const data = res.data.data;
-                let arr = {}
-                arr = data
-                console.log(data);
                 setBlockData(data)
-                console.log(blockData);
             }
         })
     }

src/components/FieldProblem/editProblem.js

@@ -206,7 +206,7 @@ function EditBlock(props) {
                 </Col>
                 {
                     type == 1 ?
-                        <div style={{color:'#1690FF'}}>
+                        <div style={{ color: '#1690FF' }}>
                             提示：<br />
                             1、校验时间范围限制为30天，每一天数据量的校验时间约为1分钟。<br />
                             时间范围以患者入院时间为准。<br />
@@ -222,7 +222,7 @@ function EditBlock(props) {
                             取消
                         </Button>
                         <Button type="primary" htmlType="submit">
-                            保存
+                            {type == 1 ? '确定' : '保存'}
                         </Button>
                     </Space>
                 </Form.Item>

src/components/FieldProblem/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Form, Input, Button, Table, Row, Col, Select, Modal, DatePicker, Space, message } from 'antd';
-import { getCookie,disabledDate } from '@utils/index'
+import { getCookie, disabledDate } from '@utils/index'
 import '@common/common.less';
 import moment from "moment";
 import "moment/locale/zh-cn"
@@ -22,6 +22,7 @@ function FieldProblem() {
     const [visible, setVisible] = useState(false);
     const [size, setSize] = useState(15);
     const [current, setCurrent] = useState(1);
+    const [probleData, setProbleData] = useState({});
     const [problemDetail, setProblemDetail] = useState(null);//详情数据
     const [title, setTitle] = useState();//正则式数据
     const [params, setParams] = useState({
@@ -49,6 +50,7 @@ function FieldProblem() {
         post(api.getColumnResultNumber, { hospitalId: getCookie('hospitalId') }).then((res) => {
             if (res.data.code === 200) {
                 const data = res.data.data;
+                setProbleData(data)
             }
         })
     }
@@ -143,7 +145,7 @@ function FieldProblem() {
                     form={form}
                     name="normal_login"
                     onFinish={onFinish}
-                    initialValues={{isSolved:'',type:''}}
+                    initialValues={{ isSolved: '', type: '' }}
                 >
                     <Row gutter={24}>
                         <Col span={6} key={0}>
@@ -221,7 +223,44 @@ function FieldProblem() {
                     </Space>
 
                 </div>
-
+                <div className="table-data" style={{ justifyContent: 'left' }}>
+                    <Row className="data-box">
+                        <Col span={6} order={1} className="box-item">
+                            <p>{probleData.notSolvedNonnull || '-'}</p>
+                            <p>数据缺失</p>
+                        </Col>
+                        <Col span={6} order={2} className="box-item">
+                            <p>{probleData.notSolvedStandardvalue || '-'}</p>
+                            <p>非标准值</p>
+                        </Col>
+                        <Col span={6} order={3} className="box-item">
+                            <p>{probleData.notSolvedRegular || '-'}</p>
+                            <p>正则校验失败</p>
+                        </Col>
+                        <Col span={6} order={4} className="box-item item">
+                            <p>{probleData.notSolved || '-'}</p>
+                            <p>未处理</p>
+                        </Col>
+                    </Row>
+                    <Row className="data-box" style={{ marginLeft: '20px' }}>
+                        <Col span={6} order={1} className="box-item">
+                            <p>{probleData.resolvedNonnull || '-'}</p>
+                            <p>数据缺失</p>
+                        </Col>
+                        <Col span={6} order={2} className="box-item">
+                            <p>{probleData.resolvedStandardvalue || '-'}</p>
+                            <p>非标准值</p>
+                        </Col>
+                        <Col span={6} order={3} className="box-item">
+                            <p>{probleData.resolvedRegular || '-'}</p>
+                            <p>正则校验失败</p>
+                        </Col>
+                        <Col span={6} order={4} className="box-item box">
+                            <p>{probleData.resolved || '-'}</p>
+                            <p>已处理</p>
+                        </Col>
+                    </Row>
+                </div>
                 <Table
                     columns={columns}
                     scroll={{ y: 'calc(100vh - 400px)' }}

src/components/UserManager/addUser.js

@@ -28,7 +28,7 @@ function AddUser(props) {
   });
   const { titleList } = staticInfo;
   const initialValues = formData;
-  console.log(form.getFieldsValue())
+  console.log(initialValues);
   let addHospitalTreeVOs = {
     depts: [],
     hospitals: [],
@@ -238,7 +238,7 @@ function AddUser(props) {
           {type == 3 ?
             <span>{initialValues.password}</span>
             :
-            <Input.Password placeholder="8-12位大小写字母、数字、特殊字符" autoComplete='off'/>
+            <Input.Password placeholder="8-12位大小写字母、数字、特殊字符" autoComplete='off' disabled={type == 2?true:false}/>
           }
         </Form.Item>
         <Form.Item
@@ -263,7 +263,7 @@ function AddUser(props) {
           {type == 3 ?
             <span>{initialValues.password}</span>
             :
-            <Input.Password placeholder="8-12位大小写字母、数字、特殊字符" autoComplete='off'/>
+            <Input.Password placeholder="8-12位大小写字母、数字、特殊字符" autoComplete='off' disabled={type == 2?true:false}/>
           }
         </Form.Item>
         <Form.Item

src/components/UserManager/index.js

@@ -48,8 +48,7 @@ function UserManager() {
   }
   const { statusList } = staticInfo;
   //新增弹窗
-  const showModal = (name, type, flag, userId) => {
-    setVisible(type);
+  const showModal = (name, flag, userId) => {
     setTitle(name);
     setType(flag)
     setUserId(userId)
@@ -61,6 +60,7 @@ function UserManager() {
     if (flag == 3 || flag == 2) {
       getUserById(userId)
     }
+    setVisible(true);
   }
   //表格数据
   function getUserPage(param) {
@@ -223,6 +223,7 @@ function UserManager() {
   }
   function userChange() {
     setVisible(false)
+    setFormData(null)
     getUserPage();
   }
   const columns = [
@@ -244,8 +245,8 @@ function UserManager() {
     {
       title: '操作', dataIndex: 'key', render: (text, record) => (
         <Space size="middle">
-          <a onClick={e => showModal('查看用户', true, 3, record.userId)}>查看</a>
-          <a onClick={e => showModal('修改用户', true, 2, record.userId)} >修改</a>
+          <a onClick={e => showModal('查看用户', 3, record.userId)}>查看</a>
+          <a onClick={e => showModal('修改用户', 2, record.userId)} >修改</a>
           <Dropdown overlay={menu.bind(this, record)} record={record}>
             <a className="ant-dropdown-link" onClick={e => e.preventDefault()}>
               更多 <DownOutlined />
@@ -324,7 +325,7 @@ function UserManager() {
       <div className="table">
         <div className="table-header">
           <h2 className="table-title">用户管理</h2>
-          <Button type="primary" icon={<PlusOutlined />} onClick={e => showModal('新增用户', true, 1)}>新增用户</Button>
+          <Button type="primary" icon={<PlusOutlined />} onClick={e => showModal('新增用户', 1)}>新增用户</Button>
         </div>
 
         <Table
@@ -349,7 +350,7 @@ function UserManager() {
           title={title}
           okText='确定'
           cancelText='取消'
-          width={'45%'}
+          width={500}
           visible={visible}
           onCancel={cancel}
           footer={null}