接口入参修改，样式调整

src/common/common.less

@@ -26,6 +26,9 @@ body {
 .ant-modal-body .ant-table-tbody > tr > td {
   padding: 6px;
 }
+.ant-layout-sider-children{
+  background: #fff;
+}
 /*.ant-table-wrapper{
   height: calc(100vh - 240px);
   overflow-y: auto;
@@ -198,19 +201,23 @@ body {
     margin-bottom: 15px;
   }
 }
+.menu-footer{
+  padding:16px 0 0 24px;
+  position: fixed;
+  bottom: 10px;
+  background: #fff;
+  p{
+    padding-bottom: 0;
+    margin-bottom: 5px;
+  }
+}
 .toogle {
-  position: absolute;
-  bottom: 20px;
-  left: 26px;
   .icon{
     font-size: 20px;
     color: #1690FF;
   }
 }
 .logoT {
-  position: absolute;
-  bottom: 10px;
-  left: 25px;
   font-size: 12px;
   font-weight: 400;
   color: #333333;

src/components/DocTemplate/index.js

@@ -47,13 +47,13 @@ function DocTemplate() {
 	  hide();
 	  if (res.data.code === 200) {
 		const data = res.data.data;
-		if(data.contentType==="html"){
+		if(+data.type===2){					//模板类型,0:未知，1:html，2:xml
+		  setVisible(flag);
+		  setTmplInfo(data);
+		}else{
 		  const myWindow=window.open('','','width=800,height=600');
 		  myWindow.document.write(data.content);
 		  myWindow.focus();
-		}else{
-		  setVisible(flag);
-		  setTmplInfo(data);
 		}
 	  }
 	})

src/components/DutyRecord/index.js

@@ -80,9 +80,6 @@ function DutyRecord() {
 		setParams(params)
 		setCurrent(page)
 		getDutyRecord()
-	}
-	function onTypeChange() {
-
 	}
 	function onSelectChange(selectedRowKeys) {
 		setSelectedRowKeys(selectedRowKeys);
@@ -129,7 +126,7 @@ function DutyRecord() {
 					form={form}
 					name="normal_login"
 					onFinish={onFinish}
-					initialValues={{ type: '0' }}
+					initialValues={{ type: '' }}
 				>
 					<Row gutter={24}>
 						<Col span={5} key={0}>
@@ -156,10 +153,9 @@ function DutyRecord() {
 							<Form.Item label="变更类型" name="type">
 								<Select
 									placeholder="请选择"
-									onChange={onTypeChange}
 									allowClear
 								>
-									<Option value="0" key={0}>全部</Option>
+									<Option value="" key={0}>全部</Option>
 									<Option value="1" key={1}>{typeMap['1']}</Option>
 									<Option value="2" key={2}>{typeMap['2']}</Option>
 								</Select>

src/components/FuncManager/index.js

@@ -3,25 +3,21 @@ import { useSelector } from 'react-redux'
 import { Table, Modal, message, Menu, Breadcrumb, Dropdown, Space, Form, Input, Button, Row, Col, Select } from 'antd';
 import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import AddFunc from './AddFunc';
-// import './index.less';
 import apiObj from '@api/index';
 import FuncContext from './func-context';
 import { pickCheckedTreeIds } from '@utils/index'
 const { post, api, xPost } = apiObj;
-const { Option } = Select;
 function OrgManager() {
   useEffect(() => {
     //刷新列表
     getMenusTree();
   }, []);
-  const [form] = Form.useForm();
   const [dataSource, setDataSource] = useState([]);   //列表数据
   const [visible, setVisible] = useState(false);   //删除禁用确认弹窗显示
   const [addVisible, setAddVisible] = useState(false);         //新增页面显示
   const [modalType, setModalType] = useState(1);
   const [id, setId] = useState('');    //当前操作功能id
   const [funcDetail, setFuncDetail] = useState(null);
-  const [typeId, setTypeId] = useState('');
   const [title, setTitle] = useState('');
   const [type, setType] = useState('');
   //从state中取出状态、类型列表

src/components/MedicalTeam/index.js

@@ -6,7 +6,6 @@ import moment from "moment";
 import "moment/locale/zh-cn"
 import medicalContext from './medical-context';
 import AddMedical from './addMedical.js';
-// import "./index.less"
 	const { post, api, } = apiObj;
 	const { RangePicker } = DatePicker;
 function MedicalTeam() {

src/components/MedicalTeam/index.less

@@ -1,5 +0,0 @@
-.medical-team-operation{
-  a{
-	margin-right: 5px;
-  }
-}

src/components/PageLayout/index.js

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { MenuUnfoldOutlined,MenuFoldOutlined } from '@ant-design/icons';
-import { Layout, Button } from 'antd';
+import { Layout } from 'antd';
 import AHeader from '../AHeader'
 import AMenu from '../AMenu'
 import ATabs from '../ATabs'
@@ -9,7 +9,7 @@ import apiObj from '@api/index';
 import { setStatusList, setHisTypeList, setTitleList, setDataList, setMsgTypeList, setMsgStatusList } from '@reducers/staticInfo';
 
 const { Content, Sider } = Layout;
-const { post, api, xPost } = apiObj;
+const { post, api } = apiObj;
 const propTypes = {
 
 }
@@ -50,10 +50,12 @@ function PageLayout() {
             <Layout>
                 <Sider className='page-sider' collapsed={collapsed} >
                     <AMenu></AMenu>
-                    <span onClick={toggleCollapsed} style={{ marginBottom: 16 }} className='toogle'>
-                        {collapsed ? <MenuUnfoldOutlined className='icon'/> : <MenuFoldOutlined className='icon'/>}
-                    </span>
-                    <span className='logoT'>©杭州朗通信息技术有限公司</span>
+                    <div className="menu-footer">
+                        <p onClick={toggleCollapsed} className='toogle'>
+                            {collapsed ? <MenuUnfoldOutlined className='icon'/> : <MenuFoldOutlined className='icon'/>}
+                        </p>
+                        <p className='logoT'>©杭州朗通信息技术有限公司</p>
+                    </div>
                 </Sider>
                 <Content className='page-content'>
                     <ATabs></ATabs>

src/components/PageLayout/index.less

@@ -1,6 +0,0 @@
-@import "@common/common.less";
-
-.page-sider{
-  height: calc(100% - 70px);
-  overflow-y: auto;
-}