Parcourir la source

更新导航tab展示大小及部分logo

code4eat il y a 2 ans
Parent
commit
d939ff05ac

BIN
public/images/blueBook.png


+ 2 - 2
src/app.tsx

@@ -240,14 +240,14 @@ export const qiankun = fetch('/config').then(() => ({
       entry: '//112.124.59.133:8804',  //测试
       //entry: '//118.31.245.65:8804', //线上
       //entry:'//192.168.50.143:8804',//本机
-      //entry: '//localhost:8804', // 开发
+      //entry: '//localhost:8805', // 开发
     },
     {
       name: 'reviewMana', // 唯一 id
       entry: '//112.124.59.133:8807',  //测试
       //entry: '//118.31.245.65:8807', //线上
       //entry:'//192.168.50.143:8804',//本机
-      //entry: '//localhost:8804', // 开发
+      //entry: '//localhost:8805', // 开发
     },
     {
       name: 'budgetManaSystem', // 唯一 id

+ 3 - 2
src/components/KCUpload/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2022-05-25 14:45:47
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-09 15:37:43
+ * @LastEditTime: 2023-03-24 16:11:16
  * @FilePath: /KC-MiddlePlatform/src/components/KCUpload/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -58,7 +58,7 @@
 
 import React, { useState } from 'react';
 import { InboxOutlined } from '@ant-design/icons';
-import type { UploadFile, UploadProps } from 'antd';
+import { Alert, UploadFile, UploadProps } from 'antd';
 import { Upload } from 'antd';
 
 import './style.less'
@@ -104,6 +104,7 @@ const KCUpload = (props: KCUploadPropsType) => {
            <span>文件下载</span>
            <span onClick={()=>download()}>模板下载</span>
       </div>
+      <Alert message="注意,导入的数据将会覆盖当前数据" type="warning" style={{height:24,fontSize:12,marginBottom:16}} showIcon closable banner />
       <Dragger {...config} height={140}>
         <p className="ant-upload-drag-icon" style={{marginBottom:5}}>
           <InboxOutlined style={{ fontSize: 50, color: '#3376FE' }} />

+ 4 - 2
src/components/topBar/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-16 09:12:37
- * @LastEditTime: 2023-03-07 16:03:00
+ * @LastEditTime: 2023-03-24 16:34:14
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /KC-MiddlePlatform/src/pages/index/components/topBar/index.tsx
@@ -239,6 +239,7 @@ const TopBar: React.FC<TopBarType> = (props) => {
       //  console.log('systemTabs.length',systemTabs.length);
        if(systemTabs.length>6){
         const tabs = systemTabs.filter((a:any,index:number)=>{
+                //暂时限制只展示最多5个
                 if(index<=5){
                    return a
                 } 
@@ -318,7 +319,8 @@ const TopBar: React.FC<TopBarType> = (props) => {
                 panelData.map((item, index) => {
                   return (
                     <div className={currentActivedBlockIndex == index ? `typeBlock active` : `typeBlock`} key={index} onClick={() => set_currentActivedBlockIndex(index)}>
-                      <img className='typeBlockIcon' src={item?.icon} alt="" />
+                      {/* <img className='typeBlockIcon' src={item?.icon} alt="" /> */}
+                      <img className='typeBlockIcon' src={require('../../../public/images/blueBook.png')} alt="" />
                       <span>{item.name}</span>
                     </div>
                   )

+ 1 - 1
src/components/topBar/style.less

@@ -106,7 +106,7 @@
       margin-right: 24px;
       .tab {
         display: flex;
-        width: 25%;
+        max-width:180px;
         height: 32px;
         line-height: 32px;
         text-align: center;

+ 0 - 1
src/global.less

@@ -309,7 +309,6 @@ div::-webkit-scrollbar-corner {
 
 
 .kcmp-ant-modal-body {
-  padding-top: 0 !important;
   .TableTransfer {
     .kcmp-ant-transfer-operation {
       align-self: self-end;

+ 3 - 3
src/pages/platform/setting/departmentMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-24 12:22:43
+ * @LastEditTime: 2023-03-24 15:24:18
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -16,7 +16,7 @@ import { getAllHosp } from '@/service/hospList';
 import { downloadTemplateReq } from '@/utils';
 import { ModalForm, ProFormSelect, ProFormText, ProFormTextArea } from '@ant-design/pro-form'
 import { ProColumns } from '@ant-design/pro-table';
-import { message, Popconfirm } from 'antd';
+import { message, Modal, Popconfirm } from 'antd';
 import FormItem from 'antd/lib/form/FormItem';
 import { useEffect, useState } from 'react'
 import { addData, delData, editData, getDepartmentData, getDepartmentType, getRelaHosp, importDepartmentData } from './service';
@@ -218,7 +218,7 @@ export default function DepartmentMana() {
                     <span  key="3">导入</span>
                 }
                 onFinish={async (values) => {
-                
+                    
                     const { importFile: { fileList } } = values;
 
                     let formData = new FormData();