修改bug及增加模块

config/routes.ts

@@ -72,6 +72,11 @@ export default [
         path: '/Home/banner',
         component: './Home/banner',
       },
+      {
+        name: 'introduction',
+        path: '/Home/introduction',
+        component: './Home/introduction',
+      },
     ],
   },
   {

src/pages/Home/banner/edit.tsx

@@ -3,10 +3,11 @@ import {
   ProForm,
   ProFormText,
   ProFormDigit,
-  ProFormRadio
+  ProFormRadio,
+  ProFormSwitch
 } from '@ant-design/pro-components';
-import { Form, Modal, Drawer, message, Upload, Space, Button, Switch,Input,Tooltip } from 'antd';
-import {InfoCircleOutlined} from '@ant-design/icons';
+import { Form, Modal, Drawer, message, Upload, Space, Button, Switch, Input, Tooltip } from 'antd';
+import { InfoCircleOutlined } from '@ant-design/icons';
 import { useIntl, FormattedMessage } from '@umijs/max';
 import { DictValueEnumObj } from '@/components/DictTag';
 import Editor from '@/components/ueditor';
@@ -22,13 +23,6 @@ export type VideoProps = {
   onSubmit: (values: any) => Promise<void>;
   open: boolean;
   currentRow: any;
-  sort: number;
-  title: string;
-  digest: string;
-  pcImg: string;
-  pcImgUrl: string;
-  mImg: string;
-  mImgUrl: string;
 };
 
 const VideoForm: React.FC<VideoProps> = (props) => {
@@ -39,17 +33,17 @@ const VideoForm: React.FC<VideoProps> = (props) => {
   useEffect(() => {
     console.log(props)
     form.resetFields();
-    if(!props.open) return;
-    if(!props.currentRow) return;
-    const {sort,title,digest,pcImg,pcImgUrl,mImg,mImgUrl} = props.currentRow;
+    if (!props.open) return;
+    if (!props.currentRow) return;
+    const { sort, title, digest, pcImg, pcImgUrl, mImg, mImgUrl, upMode } = props.currentRow;
     if (props.currentRow) {
       form.setFieldsValue({
-        sort,title,digest,pcImg,pcImgUrl,mImg,mImgUrl
+        sort, title, digest, pcImg, pcImgUrl, mImg, mImgUrl, upMode: upMode == '1' ? '1' : '0'
       })
+      setUpMode(upMode == '1' ? '1' : '0')
     }
-
     setpcImg(pcImg)
-    
+
     if (pcImgUrl && pcImg) {
       setFileList([
         {
@@ -60,7 +54,7 @@ const VideoForm: React.FC<VideoProps> = (props) => {
     }
 
     setmImg(mImg)
-    
+
     if (mImgUrl && mImg) {
       setFileList2([
         {
@@ -75,14 +69,15 @@ const VideoForm: React.FC<VideoProps> = (props) => {
 
   }, [props.open]);
 
-  
+
   const [fileList, setFileList] = useState<any>([]);
   const [fileList2, setFileList2] = useState<any>([]);
   const [pcImg, setpcImg] = useState<any>('');
   const [mImg, setmImg] = useState<any>('');
+  const [upMode, setUpMode] = useState<any>('0');
   const handleOk = async () => {
     let data = form.getFieldsValue()
-    
+
     let val = await form.validateFields()
     let formData = {
       ...data,
@@ -137,12 +132,15 @@ const VideoForm: React.FC<VideoProps> = (props) => {
     return false;
   };
 
+  const onRadioChange = (e) => {
+    setUpMode(e.target.value)
+  }
+
 
   return (
     <Drawer
       width={'80%'}
       title={props.currentRow ? '编辑' : '新建'}
-      forceRender
       open={props.open}
       destroyOnClose
       onClose={handleCancel}
@@ -159,11 +157,33 @@ const VideoForm: React.FC<VideoProps> = (props) => {
         submitter={false}
         layout="horizontal"
       >
-        <ProForm.Item
-          label={'焦点图(PC端'}
+
+
+        <ProFormRadio.Group
+          name="upMode"
+          label="焦点图类型"
+          labelCol={{ style: { width: 105 } }}
+
+          options={[
+            {
+              label: '上传文件',
+              value: '0',
+            },
+            {
+              label: '链接',
+              value: '1',
+            },
+          ]}
+          fieldProps={{
+            defaultValue: '0',
+            onChange: onRadioChange,
+          }}
+        />
+        {upMode == '0' ? <ProForm.Item
+          label={'焦点图(PC端)'}
           extra={'图片尺寸1218*915'}
           labelCol={{
-            style: { width: 95 }
+            style: { width: 105 }
           }}
           rules={[
             {
@@ -182,13 +202,19 @@ const VideoForm: React.FC<VideoProps> = (props) => {
           >
             {fileList?.length < 1 && '+' + intl.formatMessage({ id: 'public.uploadImg' })}
           </Upload>
-        </ProForm.Item>
+        </ProForm.Item> : <ProFormText
+          name="pcImgUrl"
+          label='焦点图(PC端):'
+          labelCol={{
+            style: { width: 105 }
+          }}
+        />}
 
-        <ProForm.Item
-          label={'焦点图(移动端)'}
+        {upMode == '0' ? <ProForm.Item
+          label={'焦点图(移动端):'}
           extra={'图片尺寸1218*915'}
           labelCol={{
-            style: { width: 95 }
+            style: { width: 105 }
           }}
           rules={[
             {
@@ -207,29 +233,35 @@ const VideoForm: React.FC<VideoProps> = (props) => {
           >
             {fileList2?.length < 1 && '+' + intl.formatMessage({ id: 'public.uploadImg' })}
           </Upload>
-        </ProForm.Item>
+        </ProForm.Item> : <ProFormText
+          name="mImgUrl"
+          label='焦点图(移动端)'
+          labelCol={{
+            style: { width: 105 }
+          }}
+        />}
 
         <ProFormText
           name="title"
           label='标题'
           labelCol={{
-            style: { width: 95 }
+            style: { width: 105 }
           }}
         />
 
         <ProFormText
-        name="digest"
-        label='简述'
-        labelCol={{
-          style: { width: 95 }
-        }}
-      />
+          name="digest"
+          label='简述'
+          labelCol={{
+            style: { width: 105 }
+          }}
+        />
 
         <ProFormDigit
           name="sort"
           label="排序"
           labelCol={{
-            style: { width: 95 }
+            style: { width: 105 }
           }}
           placeholder="请输入排序"
           rules={[

src/pages/Home/introduction/index.tsx

@@ -0,0 +1,103 @@
+import React, { useRef, useEffect } from 'react';
+import type { FormInstance } from 'antd';
+import { Button, message } from 'antd';
+import { PageContainer, ProForm, ProFormTextArea } from '@ant-design/pro-components';
+import { saveIntroduce,getIntroduceDetail } from '@/services/home/introduction';
+import { push } from '@/services/home/banner';
+import { KeepAlive } from 'react-activation';
+
+
+const NoticeTableList: React.FC = () => {
+    const form = useRef<FormInstance>(null)
+
+    useEffect(()=>{
+        setTimeout(() => {
+            getDetail()
+        },100)
+    },[form])
+    const getDetail = async ()=>{
+        try {
+            const res = await getIntroduceDetail()
+            if(res.code === 200){
+                if(res.data){
+                    form.current.setFieldsValue(res.data)
+                }
+            }else{
+                message.error(res.msg || '操作失败，请重试')
+            }
+        } catch (error) {
+            
+        }
+        
+    }
+    const onFinishForm = async (values)=>{
+        try {
+            console.log('values',values)
+            const res = await saveIntroduce(values)
+            if(res.code === 200){
+                message.success('保存成功')
+            }else{
+                message.error(res.msg || '操作失败，请重试')
+            }
+        } catch (error) {
+            
+        }
+    }
+
+    /**
+     * 一键发布
+     */
+    const publishing = async () => {
+        try {
+            const resp = await push();
+            if (resp.code === 200) {
+                message.success('发布成功');
+            } else {
+                message.error(resp.msg);
+            }
+        } catch (error) { }
+    }
+    return (
+        <KeepAlive name='集团介绍' path="/Home/introduction">
+            <PageContainer>
+                <div style={{ width: '100%', float: 'right' }}>
+                    <div style={{ width:'100%',padding:'30px',display:'flex',alignItems:'center',justifyContent:'space-between' }}>
+                        <div></div>
+                        <div>
+                            <Button
+                                type="primary"
+                                key="fabu"
+                                onClick={publishing}
+                                style={{ marginRight: 10 }}
+                            >
+                                一键发布
+                            </Button>
+                            <Button type='primary' onClick={() => form?.current?.submit()}>保存</Button>
+                        </div>
+                    </div>
+                    <ProForm
+                        formRef={form}
+                        grid={true}
+                        submitter={false}
+                        layout="horizontal"
+                        onFinish={onFinishForm}
+                    >
+                        <ProFormTextArea
+                            name="introduceMsg"
+                            label='集团介绍'
+                            labelCol={{
+                                style: { width: 95 }
+                            }}
+                        />
+
+                    </ProForm>
+                    
+                </div>
+               
+            </PageContainer>
+        </KeepAlive>
+
+    );
+};
+
+export default NoticeTableList;

src/pages/JoinZZ/biddingDocument/edit.tsx

@@ -136,6 +136,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
   }, [props.open]);
 
   useEffect(() => {
+    if (!props.open) return;
     var Parchment = Quill.import('parchment');
 
     let config = {
@@ -193,7 +194,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
 
     // });
 
-  }, []);
+  }, [props.open]);
 
 
   const [fileList, setFileList] = useState<any>([]);
@@ -266,7 +267,6 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
     <Drawer
       width={'80%'}
       title={props.currentRow ? '新闻编辑' : '新建新闻'}
-      forceRender
       open={props.open}
       destroyOnClose
       onClose={handleCancel}

src/pages/JoinZZ/vacancy/edit.tsx

@@ -135,6 +135,7 @@ const VacancyForm: React.FC<VacancyProps> = (props) => {
   }, [props.open]);
 
   useEffect(() => {
+    if (!props.open) return;
     var Parchment = Quill.import('parchment');
 
     let config = {
@@ -192,7 +193,7 @@ const VacancyForm: React.FC<VacancyProps> = (props) => {
 
     // });
 
-  }, []);
+  }, [props.open]);
 
 
   const [fileList, setFileList] = useState<any>([]);
@@ -265,7 +266,6 @@ const VacancyForm: React.FC<VacancyProps> = (props) => {
     <Drawer
       width={'80%'}
       title={props.currentRow ? '新闻编辑' : '新建新闻'}
-      forceRender
       open={props.open}
       destroyOnClose
       onClose={handleCancel}

src/pages/News/NewsList/edit.tsx

@@ -161,7 +161,7 @@ const NewsForm: React.FC<NewsProps> = (props) => {
       },
       theme: 'snow'
     });
-
+    console.log('editor',editor)
     // 工具栏附件按钮
     let a = document.querySelectorAll(".ql-wordBox")[0]
     let b = document.querySelectorAll(".ql-wordBox")[1]

src/pages/PartyWork/partyWork/edit.tsx

@@ -2,23 +2,18 @@ import React, { useEffect, useState, useRef } from 'react';
 import {
   ProForm,
   ProFormText,
-  ProFormUploadButton,
   ProFormSelect,
   ProFormDatePicker,
-  ProFormRadio
 } from '@ant-design/pro-components';
-import { Form, Modal, Drawer, message, Upload, Space, Button, Switch,Input,Tooltip } from 'antd';
-import {InfoCircleOutlined} from '@ant-design/icons';
+import { Form, Drawer, Upload, Space, Button } from 'antd';
 
 import { useIntl, FormattedMessage } from '@umijs/max';
-import { DictValueEnumObj } from '@/components/DictTag';
 import Editor from '@/components/ueditor';
 import { upload } from '@/services/partyWork/partyWork';
 import { getDataEnumList } from '@/services/system/Enum';
 import Quill from "quill";
 import "quill/dist/quill.snow.css";
 import moment from 'moment';
-import { trim } from 'lodash';
 let editor: any;
 
 export type PartyWorkProps = {
@@ -26,11 +21,6 @@ export type PartyWorkProps = {
   onSubmit: (values: any) => Promise<void>;
   open: boolean;
   currentRow: any;
-  date: any;
-  title: string;
-  content: string;
-  surface: string;
-  surfaceUrl: string;
 };
 
 let toolbarOptions = [
@@ -137,6 +127,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
   }, [props.open]);
 
   useEffect(() => {
+    if(!props.open) return;
     var Parchment = Quill.import('parchment');
 
     let config = {
@@ -148,6 +139,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
     };
 
     let wordBox = new Parchment.Attributor.Style('wordBox', 'line-height', config);
+    console.log('wordBox',wordBox)
 
     Quill.register(wordBox, true);
     editor = new Quill('#editor', {
@@ -159,7 +151,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
       },
       theme: 'snow'
     });
-
+    console.log('editor',editor)
     // 工具栏附件按钮
     let a = document.querySelectorAll(".ql-wordBox")[0]
     let b = document.querySelectorAll(".ql-wordBox")[1]
@@ -194,7 +186,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
 
     // });
 
-  }, []);
+  }, [props.open]);
 
 
   const [fileList, setFileList] = useState<any>([]);
@@ -267,7 +259,6 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
     <Drawer
       width={'80%'}
       title={props.currentRow ? '文章编辑' : '新建文章'}
-      forceRender
       open={props.open}
       destroyOnClose
       onClose={handleCancel}

src/pages/PartyWork/partyWork/index.tsx

@@ -221,7 +221,7 @@ const publishing = async () => {
     } catch (error) { }
 }
     return (
-        <KeepAlive name={'党建工作'} path="/PartyWork/partyWork">
+        <KeepAlive name={'党建工作'} path="/PartyWork/PartyWork">
             <PageContainer>
                 <div style={{ width: '100%', float: 'right' }}>
                     <ProTable<API.System.Notice>

src/pages/SocialRespon/socialRespon/index.tsx

@@ -201,7 +201,7 @@ const publishing = async () => {
     } catch (error) { }
 }
     return (
-        <KeepAlive name={'党建工作'} path="/SocialRespon/partyWork">
+        <KeepAlive name={'社会责任'} path="/SocialRespon/socialRespon">
             <PageContainer>
                 <div style={{ width: '100%', float: 'right' }}>
                     <ProTable<API.System.Notice>

src/services/home/introduction.ts

@@ -0,0 +1,21 @@
+import { request } from '@umijs/max'; 
+
+// 查询
+export async function getIntroduceDetail(params: any) {
+  return request('/api/system/introduce/selectIntroduce', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}
+
+// 保存
+export async function saveIntroduce(data: any) {
+  return request('/api/system/introduce/saveIntroduce', {
+    method: 'post',
+    data: data, 
+  });
+}
+